Skip to content

Commit 190a6df

Browse files
anicyneanicyne
authored
Merge branch 'develop' into 7460-v2-fix-input-icons-and-select-option-prop-v3
2 parents 0a8ac9b + bfd616e commit 190a6df

File tree

8 files changed

+76
-143
lines changed

8 files changed

+76
-143
lines changed

‎package.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"prettier": "3.5.3",
1414
"rimraf": "6.0.1",
1515
"ts-node": "10.9.2",
16-
"ts-prune": "0.10.3",
1716
"typescript": "5.8.2"
1817
},
1918
"engines": {
@@ -29,7 +28,6 @@
2928
"lint": "pnpm -r lint",
3029
"lint-staged": "lint-staged",
3130
"unused": "pnpm -r unused",
32-
"ts-prune": "git clean -f -d -X packages/adapters/**/src && pnpm -r exec npx ts-prune src -e",
3331
"ncu:major": "ncu && pnpm -r exec ncu",
3432
"ncu:minor": "ncu -t minor -u && pnpm -r exec ncu -t minor -u -x @types/react,@stencil/core,@unocss/*",
3533
"ncu:patch": "ncu -t patch -u && pnpm -r exec ncu -t patch -u -x @types/react",

‎packages/.ts-prunerc.js‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎packages/components/src/components/@else/all/component.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ type States = Generic.Element.Members<RequiredStates, OptionalStates>;
1313
// @Component({
1414
// tag: 'kol-all',
1515
// })
16-
// ts-prune-ignore-next
1716
export class KolAll implements Generic.Element.ComponentApi<RequiredProps, OptionalProps, RequiredStates, OptionalStates> {
1817
@State() public state: States = {};
1918

‎packages/components/src/components/@else/counter/component.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { h, Host, State } from '@stencil/core';
1010
// },
1111
// shadow: true,
1212
// })
13-
// ts-prune-ignore-next
1413
export class KolCounter {
1514
@State() public state = {
1615
_count: 0,

‎packages/components/src/components/input-file/style.scss‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,16 @@
2020
opacity: 0;
2121
cursor: pointer;
2222

23-
&:disabled {
23+
&::-webkit-file-upload-button,
24+
&::file-selector-button {
25+
cursor: pointer;
26+
}
27+
28+
&:disabled,
29+
&:disabled::-webkit-file-upload-button,
30+
&:disabled::file-selector-button {
2431
cursor: not-allowed;
32+
pointer-events: none;
2533
}
2634
}
2735

‎packages/components/src/schema/utils/contrast/contrast.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ type RGBA = [number, number, number, number];
3131
// const randomColor = () => Math.floor(Math.random() * 16777215).toString(16);
3232

3333
// https://24ways.org/2010/calculating-color-contrast/
34-
// ts-prune-ignore-next
3534
export const getContrastYIQ = (r: number, g: number, b: number): number => {
3635
const yiq = (r * 299 + g * 587 + b * 114) / 1000;
3736
return yiq >= 128 ? -1 : 1;
@@ -46,7 +45,6 @@ export type ColorContrast<T> = ColorPair<T> & {
4645
contrast: number;
4746
};
4847

49-
// ts-prune-ignore-next
5048
export const calcColorContrast = (baseColor: RGB, contrastColor: RGB, ratio: number, dir = 1): ColorContrast<RGB> => {
5149
const color: RGB = [
5250
Math.max(Math.min(Math.round(contrastColor[0] + dir * Math.max(1, contrastColor[0] / 100)), 255), 0),
@@ -68,7 +66,6 @@ export const calcColorContrast = (baseColor: RGB, contrastColor: RGB, ratio: num
6866

6967
const cache: Map<unknown, ColorContrast<RGB>> = new Map();
7068

71-
// ts-prune-ignore-next
7269
export const getColorContrast = (baseColor: RGB, contrastColor: RGB, ratio: number, dir = 1): ColorContrast<RGB> => {
7370
if (cache.has(baseColor)) {
7471
return cache.get(baseColor) as ColorContrast<RGB>;

‎packages/samples/react/unocss.config.ts‎

Lines changed: 67 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -13,131 +13,130 @@ function convertDynamicClassValueToRem(value: string) {
1313
return pxValueToRem(Number.parseFloat(value) * 16 / 4);
1414
}
1515

16-
// ts-prune-ignore-next
1716
export default defineConfig({
1817
rules: [
19-
[/^p-(\d+)$/, ([, d]) => ({
20-
padding: convertDynamicClassValueToRem(d)
18+
[/^p-(\d+)$/, ([, d]) => ({
19+
padding: convertDynamicClassValueToRem(d)
2120
})],
2221

23-
[/^px-(\d+)$/, ([, d]) => ({
22+
[/^px-(\d+)$/, ([, d]) => ({
2423
'padding-left': convertDynamicClassValueToRem(d),
25-
'padding-right': convertDynamicClassValueToRem(d)
24+
'padding-right': convertDynamicClassValueToRem(d)
2625
})],
27-
[/^py-(\d+)$/, ([, d]) => ({
26+
[/^py-(\d+)$/, ([, d]) => ({
2827
'padding-top': convertDynamicClassValueToRem(d),
29-
'padding-bottom': convertDynamicClassValueToRem(d)
28+
'padding-bottom': convertDynamicClassValueToRem(d)
3029
})],
3130

32-
[/^ps-(\d+)$/, ([, d]) => ({
33-
'padding-inline-start': convertDynamicClassValueToRem(d)
31+
[/^ps-(\d+)$/, ([, d]) => ({
32+
'padding-inline-start': convertDynamicClassValueToRem(d)
3433
})],
35-
[/^pe-(\d+)$/, ([, d]) => ({
36-
'padding-inline-end': convertDynamicClassValueToRem(d)
34+
[/^pe-(\d+)$/, ([, d]) => ({
35+
'padding-inline-end': convertDynamicClassValueToRem(d)
3736
})],
3837

39-
[/^pt-(\d+)$/, ([, d]) => ({
40-
'padding-top': convertDynamicClassValueToRem(d)
38+
[/^pt-(\d+)$/, ([, d]) => ({
39+
'padding-top': convertDynamicClassValueToRem(d)
4140
})],
42-
[/^pl-(\d+)$/, ([, d]) => ({
43-
'padding-left': convertDynamicClassValueToRem(d)
41+
[/^pl-(\d+)$/, ([, d]) => ({
42+
'padding-left': convertDynamicClassValueToRem(d)
4443
})],
45-
[/^pr-(\d+)$/, ([, d]) => ({
46-
'padding-right': convertDynamicClassValueToRem(d)
44+
[/^pr-(\d+)$/, ([, d]) => ({
45+
'padding-right': convertDynamicClassValueToRem(d)
4746
})],
48-
[/^pb-(\d+)$/, ([, d]) => ({
49-
'padding-bottom': convertDynamicClassValueToRem(d)
47+
[/^pb-(\d+)$/, ([, d]) => ({
48+
'padding-bottom': convertDynamicClassValueToRem(d)
5049
})],
5150

52-
[/^p-t-(\d+)$/, ([, d]) => ({
53-
'padding-top': convertDynamicClassValueToRem(d)
51+
[/^p-t-(\d+)$/, ([, d]) => ({
52+
'padding-top': convertDynamicClassValueToRem(d)
5453
})],
55-
[/^p-l-(\d+)$/, ([, d]) => ({
56-
'padding-left': convertDynamicClassValueToRem(d)
54+
[/^p-l-(\d+)$/, ([, d]) => ({
55+
'padding-left': convertDynamicClassValueToRem(d)
5756
})],
58-
[/^p-r-(\d+)$/, ([, d]) => ({
59-
'padding-right': convertDynamicClassValueToRem(d)
57+
[/^p-r-(\d+)$/, ([, d]) => ({
58+
'padding-right': convertDynamicClassValueToRem(d)
6059
})],
61-
[/^p-b-(\d+)$/, ([, d]) => ({
62-
'padding-bottom': convertDynamicClassValueToRem(d)
60+
[/^p-b-(\d+)$/, ([, d]) => ({
61+
'padding-bottom': convertDynamicClassValueToRem(d)
6362
})],
6463

65-
[/^m-(\d+)$/, ([, d]) => ({
66-
margin: convertDynamicClassValueToRem(d)
64+
[/^m-(\d+)$/, ([, d]) => ({
65+
margin: convertDynamicClassValueToRem(d)
6766
})],
6867

69-
[/^mx-(\d+)$/, ([, d]) => ({
68+
[/^mx-(\d+)$/, ([, d]) => ({
7069
'margin-left': convertDynamicClassValueToRem(d),
71-
'margin-right': convertDynamicClassValueToRem(d)
70+
'margin-right': convertDynamicClassValueToRem(d)
7271
})],
73-
[/^my-(\d+)$/, ([, d]) => ({
72+
[/^my-(\d+)$/, ([, d]) => ({
7473
'margin-top': convertDynamicClassValueToRem(d),
75-
'margin-bottom': convertDynamicClassValueToRem(d)
74+
'margin-bottom': convertDynamicClassValueToRem(d)
7675
})],
7776

78-
[/^ms-(\d+)$/, ([, d]) => ({
79-
'margin-inline-start': convertDynamicClassValueToRem(d)
77+
[/^ms-(\d+)$/, ([, d]) => ({
78+
'margin-inline-start': convertDynamicClassValueToRem(d)
8079
})],
81-
[/^me-(\d+)$/, ([, d]) => ({
82-
'margin-inline-end': convertDynamicClassValueToRem(d)
80+
[/^me-(\d+)$/, ([, d]) => ({
81+
'margin-inline-end': convertDynamicClassValueToRem(d)
8382
})],
8483

85-
[/^mt$/, ([, d]) => ({
86-
'margin-top': pxValueToRem(16)
84+
[/^mt$/, ([, d]) => ({
85+
'margin-top': pxValueToRem(16)
8786
})],
88-
[/^ml$/, ([, d]) => ({
89-
'margin-left': pxValueToRem(16)
87+
[/^ml$/, ([, d]) => ({
88+
'margin-left': pxValueToRem(16)
9089
})],
91-
[/^mr$/, ([, d]) => ({
92-
'margin-right': pxValueToRem(16)
90+
[/^mr$/, ([, d]) => ({
91+
'margin-right': pxValueToRem(16)
9392
})],
94-
[/^mb$/, ([, d]) => ({
95-
'margin-bottom': pxValueToRem(16)
93+
[/^mb$/, ([, d]) => ({
94+
'margin-bottom': pxValueToRem(16)
9695
})],
9796

98-
[/^mt-(\d+)$/, ([, d]) => ({
99-
'margin-top': convertDynamicClassValueToRem(d)
97+
[/^mt-(\d+)$/, ([, d]) => ({
98+
'margin-top': convertDynamicClassValueToRem(d)
10099
})],
101-
[/^ml-(\d+)$/, ([, d]) => ({
102-
'margin-left': convertDynamicClassValueToRem(d)
100+
[/^ml-(\d+)$/, ([, d]) => ({
101+
'margin-left': convertDynamicClassValueToRem(d)
103102
})],
104-
[/^mr-(\d+)$/, ([, d]) => ({
105-
'margin-right': convertDynamicClassValueToRem(d)
103+
[/^mr-(\d+)$/, ([, d]) => ({
104+
'margin-right': convertDynamicClassValueToRem(d)
106105
})],
107-
[/^mb-(\d+)$/, ([, d]) => ({
108-
'margin-bottom': convertDynamicClassValueToRem(d)
106+
[/^mb-(\d+)$/, ([, d]) => ({
107+
'margin-bottom': convertDynamicClassValueToRem(d)
109108
})],
110109

111-
[/^m-t-(\d+)$/, ([, d]) => ({
112-
'margin-top': convertDynamicClassValueToRem(d)
110+
[/^m-t-(\d+)$/, ([, d]) => ({
111+
'margin-top': convertDynamicClassValueToRem(d)
113112
})],
114-
[/^m-l-(\d+)$/, ([, d]) => ({
115-
'margin-left': convertDynamicClassValueToRem(d)
113+
[/^m-l-(\d+)$/, ([, d]) => ({
114+
'margin-left': convertDynamicClassValueToRem(d)
116115
})],
117-
[/^m-r-(\d+)$/, ([, d]) => ({
118-
'margin-right': convertDynamicClassValueToRem(d)
116+
[/^m-r-(\d+)$/, ([, d]) => ({
117+
'margin-right': convertDynamicClassValueToRem(d)
119118
})],
120-
[/^m-b-(\d+)$/, ([, d]) => ({
121-
'margin-bottom': convertDynamicClassValueToRem(d)
119+
[/^m-b-(\d+)$/, ([, d]) => ({
120+
'margin-bottom': convertDynamicClassValueToRem(d)
122121
})],
123122

124-
[/^mb-sm$/, ([, d]) => ({
125-
'margin-bottom': pxValueToRem(14)
123+
[/^mb-sm$/, ([, d]) => ({
124+
'margin-bottom': pxValueToRem(14)
126125
})],
127126

128127
[/^gap-(\d+)$/, ([, d]) => ({ gap: convertDynamicClassValueToRem(d) })],
129128
[/^gap-x-(\d+)$/, ([, d]) => ({ 'column-gap': convertDynamicClassValueToRem(d) })],
130129
[/^gap-y-(\d+)$/, ([, d]) => ({ 'row-gap': convertDynamicClassValueToRem(d) })],
131-
132-
[/^w-(\d+)rem$/, ([, d]) => ({
133-
width: pxValueToRem(Number.parseInt(d) * 16)
130+
131+
[/^w-(\d+)rem$/, ([, d]) => ({
132+
width: pxValueToRem(Number.parseInt(d) * 16)
134133
})],
135134

136-
[/^w-sm$/, () => ({
135+
[/^w-sm$/, () => ({
137136
width: pxValueToRem(24 * 16) // 24rem
138137
})],
139138
],
140-
extendTheme: (theme: any) => {
139+
extendTheme: (theme: any) => {
141140
return {
142141
...theme,
143142
fontSize: {

0 commit comments

Comments
 (0)
⚡