ncore-ui-kit 1.1.0-alpha.2 → 1.1.0-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/module/components/highlightButton/index.js +2 -1
- package/lib/module/components/highlightButton/index.js.map +1 -1
- package/lib/module/components/localeSwitcher/index.js +5 -3
- package/lib/module/components/localeSwitcher/index.js.map +1 -1
- package/lib/module/components/paletteSwitcher/index.js +5 -3
- package/lib/module/components/paletteSwitcher/index.js.map +1 -1
- package/lib/module/components/themeSwitcher/index.js +5 -3
- package/lib/module/components/themeSwitcher/index.js.map +1 -1
- package/lib/module/package.json +1 -1
- package/lib/package.json +1 -1
- package/lib/src/components/highlightButton/index.js +2 -2
- package/lib/src/components/localeSwitcher/index.js +5 -5
- package/lib/src/components/paletteSwitcher/index.js +5 -5
- package/lib/src/components/themeSwitcher/index.js +5 -5
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/typescript/package.json +1 -1
- package/lib/typescript/src/components/highlightButton/index.d.ts.map +1 -1
- package/lib/typescript/src/components/highlightButton/type.d.ts +1 -0
- package/lib/typescript/src/components/highlightButton/type.d.ts.map +1 -1
- package/lib/typescript/src/components/localeSwitcher/index.d.ts.map +1 -1
- package/lib/typescript/src/components/paletteSwitcher/index.d.ts.map +1 -1
- package/lib/typescript/src/components/themeSwitcher/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/highlightButton/index.tsx +2 -1
- package/src/components/highlightButton/type.ts +1 -0
- package/src/components/localeSwitcher/index.tsx +7 -5
- package/src/components/paletteSwitcher/index.tsx +7 -5
- package/src/components/themeSwitcher/index.tsx +7 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/highlightButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,qBAAqB,MAAM,QAAQ,CAAC;AAahD;;;;GAIG;AACH,QAAA,MAAM,eAAe,EAAE,EAAE,CAAC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/highlightButton/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,qBAAqB,MAAM,QAAQ,CAAC;AAahD;;;;GAIG;AACH,QAAA,MAAM,eAAe,EAAE,EAAE,CAAC,qBAAqB,CAgL9C,CAAC;AACF,eAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/components/highlightButton/type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,SAAS,EACZ,MAAM,OAAO,CAAC;AACf,OAAO,EACH,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,SAAS,EACd,KAAK,SAAS,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EACH,KAAK,cAAc,EACtB,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,+BAA+B,GAAG;IAC1C,4BAA4B,CAAC,EAAE,2CAA2C,CAAC;IAC3E,iBAAiB,CAAC,EAAE,MAAM,UAAU,CAAC,mBAAmB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACzE,WAAW,CAAC,EAAE,MAAM,UAAU,CAAC,mBAAmB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACnE,6BAA6B,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IAC3D,eAAe,CAAC,EAAE,8BAA8B,CAAC;IACjD,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAC/C,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC3C,WAAW,EAAE,uBAAuB,CAAC;IACrC,WAAW,EAAE,oBAAoB,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACtC,iBAAiB,EAAE,MAAM,UAAU,CAAC,MAAM,CAAC;IAC3C,eAAe,EAAE,MAAM,UAAU,CAAC,MAAM,CAAC;IACzC,QAAQ,EAAE,MAAM,UAAU,CAAC,UAAU,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAC/B,WAAW,EAAE,MAAM,UAAU,CAAC,mBAAmB,CAAC;IAClD,UAAU,EAAE,MAAM,UAAU,CAAC,iBAAiB,CAAC;IAC/C,SAAS,EAAE,MAAM,UAAU,CAAC,iBAAiB,CAAC;IAC9C,cAAc,EAAE,MAAM,UAAU,CAAC,SAAS,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IAClC,QAAQ,EAAE,MAAM,UAAU,CAAC,UAAU,CAAC;IACtC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC1C,IAAI,EAAE,mBAAmB,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC1C,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,EAAE,mBAAmB,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,CAAC;AAE9G,MAAM,MAAM,2CAA2C,GAAG,MAAM,GAAG,UAAU,CAAC;AAE9E,MAAM,MAAM,8BAA8B,GAAG,UAAU,GAAG,SAAS,GAAG,MAAM,CAAC;AAE7E,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE/D,UAAU,qBAAsB,SAAQ,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,UAAU,CAAC;IAC3E,4BAA4B,CAAC,EAAE,2CAA2C,CAAC;IAC3E,iBAAiB,CAAC,EAAE,MAAM,UAAU,CAAC,mBAAmB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACzE,eAAe,CAAC,EAAE,MAAM,UAAU,CAAC,mBAAmB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACvE,eAAe,CAAC,EAAE,MAAM,UAAU,CAAC,mBAAmB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACvE,WAAW,CAAC,EAAE,MAAM,UAAU,CAAC,mBAAmB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACnE,UAAU,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IAC3D,6BAA6B,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,KAAK,CAAC;IAC3D,WAAW,CAAC,EAAE;QACV,cAAc,CAAC,EAAE,MAAM,UAAU,CAAC,iBAAiB,CAAC;QACpD,SAAS,CAAC,EAAE,MAAM,UAAU,CAAC,YAAY,CAAC;QAC1C,UAAU,CAAC,EAAE,MAAM,UAAU,CAAC,UAAU,CAAC;QACzC,QAAQ,CAAC,EAAE,MAAM,UAAU,CAAC,QAAQ,CAAC;KACxC,CAAC;IACF,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACtD,eAAe,CAAC,EAAE,8BAA8B,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,SAAS,CAAC;IAChC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AACD,YAAY,EACR,qBAAqB,IAAI,OAAO,EACnC,CAAC"}
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/components/highlightButton/type.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/localeSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,oBAAoB,MAAM,QAAQ,CAAC;AAiB/C,QAAA,MAAM,cAAc,EAAE,EAAE,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/localeSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,oBAAoB,MAAM,QAAQ,CAAC;AAiB/C,QAAA,MAAM,cAAc,EAAE,EAAE,CAAC,oBAAoB,CAgJ5C,CAAC;AACF,eAAe,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/paletteSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,qBAAqB,MAAM,QAAQ,CAAC;AAkBhD,QAAA,MAAM,eAAe,EAAE,EAAE,CAAC,qBAAqB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/paletteSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,qBAAqB,MAAM,QAAQ,CAAC;AAkBhD,QAAA,MAAM,eAAe,EAAE,EAAE,CAAC,qBAAqB,CAiK9C,CAAC;AACF,eAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/themeSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,mBAAmB,MAAM,QAAQ,CAAC;AAiB9C,QAAA,MAAM,aAAa,EAAE,EAAE,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/components/themeSwitcher/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAAE,EACV,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,mBAAmB,MAAM,QAAQ,CAAC;AAiB9C,QAAA,MAAM,aAAa,EAAE,EAAE,CAAC,mBAAmB,CA2J1C,CAAC;AACF,eAAe,aAAa,CAAC"}
|
package/package.json
CHANGED
|
@@ -43,6 +43,7 @@ const HighlightButton: FC<IHighlightButtonProps> = ({
|
|
|
43
43
|
customTheme,
|
|
44
44
|
titleStyle,
|
|
45
45
|
isLoading,
|
|
46
|
+
iconSize,
|
|
46
47
|
onPress,
|
|
47
48
|
title,
|
|
48
49
|
style,
|
|
@@ -98,7 +99,7 @@ const HighlightButton: FC<IHighlightButtonProps> = ({
|
|
|
98
99
|
};
|
|
99
100
|
|
|
100
101
|
const iconProps: NCoreUIKit.IconCallbackProps = {
|
|
101
|
-
size: Number(typography[currentSize.fontSize].fontSize),
|
|
102
|
+
size: iconSize ? iconSize : Number(typography[currentSize.fontSize].fontSize),
|
|
102
103
|
color: currentType.iconColor
|
|
103
104
|
};
|
|
104
105
|
|
|
@@ -24,9 +24,11 @@ const LocaleSwitcher: FC<ILocaleSwitcherProps> = ({
|
|
|
24
24
|
variants: variantsProps = [],
|
|
25
25
|
isWorkWithHighlightButton,
|
|
26
26
|
isWorkWithNextShowSystem,
|
|
27
|
+
customBorderColor,
|
|
27
28
|
customLocalize,
|
|
28
|
-
|
|
29
|
+
customColor,
|
|
29
30
|
style,
|
|
31
|
+
color,
|
|
30
32
|
...props
|
|
31
33
|
}) => {
|
|
32
34
|
const {
|
|
@@ -120,14 +122,14 @@ const LocaleSwitcher: FC<ILocaleSwitcherProps> = ({
|
|
|
120
122
|
|
|
121
123
|
const allProps = {
|
|
122
124
|
...props,
|
|
123
|
-
customBorderColor: currentVariant && currentVariant.borderColor ?
|
|
125
|
+
customBorderColor: customBorderColor || (currentVariant && currentVariant.borderColor ?
|
|
124
126
|
currentVariant.borderColor
|
|
125
127
|
:
|
|
126
|
-
color,
|
|
127
|
-
customColor: currentVariant && currentVariant.backgroundColor ?
|
|
128
|
+
color),
|
|
129
|
+
customColor: customColor || (currentVariant && currentVariant.backgroundColor ?
|
|
128
130
|
currentVariant.backgroundColor
|
|
129
131
|
:
|
|
130
|
-
color,
|
|
132
|
+
color),
|
|
131
133
|
icon: ({
|
|
132
134
|
color,
|
|
133
135
|
size
|
|
@@ -25,9 +25,11 @@ const PaletteSwitcher: FC<IPaletteSwitcherProps> = ({
|
|
|
25
25
|
variants: variantsProps = [],
|
|
26
26
|
isWorkWithHighlightButton,
|
|
27
27
|
isWorkWithNextShowSystem,
|
|
28
|
+
customBorderColor,
|
|
28
29
|
customTheme,
|
|
29
|
-
|
|
30
|
+
customColor,
|
|
30
31
|
style,
|
|
32
|
+
color,
|
|
31
33
|
...props
|
|
32
34
|
}) => {
|
|
33
35
|
const {
|
|
@@ -138,14 +140,14 @@ const PaletteSwitcher: FC<IPaletteSwitcherProps> = ({
|
|
|
138
140
|
|
|
139
141
|
const allProps = {
|
|
140
142
|
...props,
|
|
141
|
-
customBorderColor: currentVariant && currentVariant.borderColor ?
|
|
143
|
+
customBorderColor: customBorderColor || (currentVariant && currentVariant.borderColor ?
|
|
142
144
|
currentVariant.borderColor
|
|
143
145
|
:
|
|
144
|
-
color,
|
|
145
|
-
customColor: currentVariant && currentVariant.backgroundColor ?
|
|
146
|
+
color),
|
|
147
|
+
customColor: customColor || (currentVariant && currentVariant.backgroundColor ?
|
|
146
148
|
currentVariant.backgroundColor
|
|
147
149
|
:
|
|
148
|
-
color,
|
|
150
|
+
color),
|
|
149
151
|
icon: ({
|
|
150
152
|
color,
|
|
151
153
|
size
|
|
@@ -24,9 +24,11 @@ const ThemeSwitcher: FC<IThemeSwitcherProps> = ({
|
|
|
24
24
|
variants: variantsProps = [],
|
|
25
25
|
isWorkWithHighlightButton,
|
|
26
26
|
isWorkWithNextShowSystem,
|
|
27
|
+
customBorderColor,
|
|
27
28
|
customTheme,
|
|
28
|
-
|
|
29
|
+
customColor,
|
|
29
30
|
style,
|
|
31
|
+
color,
|
|
30
32
|
...props
|
|
31
33
|
}) => {
|
|
32
34
|
const {
|
|
@@ -131,14 +133,14 @@ const ThemeSwitcher: FC<IThemeSwitcherProps> = ({
|
|
|
131
133
|
|
|
132
134
|
const allProps = {
|
|
133
135
|
...props,
|
|
134
|
-
customBorderColor: currentVariant && currentVariant.borderColor ?
|
|
136
|
+
customBorderColor: customBorderColor || (currentVariant && currentVariant.borderColor ?
|
|
135
137
|
currentVariant.borderColor
|
|
136
138
|
:
|
|
137
|
-
color,
|
|
138
|
-
customColor: currentVariant && currentVariant.backgroundColor ?
|
|
139
|
+
color),
|
|
140
|
+
customColor: customColor || (currentVariant && currentVariant.backgroundColor ?
|
|
139
141
|
currentVariant.backgroundColor
|
|
140
142
|
:
|
|
141
|
-
color,
|
|
143
|
+
color),
|
|
142
144
|
icon: ({
|
|
143
145
|
color,
|
|
144
146
|
size
|