浏览代码

Merge branch 'release/1.1.0-alpha.9'

lfabl 2 周之前
父节点
当前提交
ac665d6769

+ 2 - 2
package.json

@@ -1,6 +1,6 @@
 {
     "name": "ncore-ui-kit",
-    "version": "1.1.0-alpha.8",
+    "version": "1.1.0-alpha.9",
     "description": "NİBGAT® | NCore - UI Kit for React-Native Mobile Apps.",
     "main": "./lib/module/index.js",
     "types": "./lib/typescript/src/index.d.ts",
@@ -181,7 +181,7 @@
     },
     "release-it": {
         "git": {
-            "commitMessage": "chore: release ${version}",
+            "commitMessage": "Release: v${version}",
             "tagName": "v${version}"
         },
         "npm": {

+ 13 - 13
src/components/button/index.tsx

@@ -139,17 +139,17 @@ const Button: FC<IButtonProps> = ({
             return null;
         }
 
-        if(!isDisabled && !isLoading) {
-            if(customTextColor) {
-                const _customTextColor = customTextColor as keyof NCoreUIKit.ProjectColorPalette;
-                iconProps.customColor = colors.project[_customTextColor] ? colors.project[_customTextColor] : customTextColor;
-            }
+        // if(!isDisabled && !isLoading) {
+        if(customTextColor) {
+            const _customTextColor = customTextColor as keyof NCoreUIKit.ProjectColorPalette;
+            iconProps.customColor = colors.project[_customTextColor] ? colors.project[_customTextColor] : customTextColor;
+        }
 
-            if(customIconColor) {
-                const _customIconColor = customIconColor as keyof NCoreUIKit.ProjectColorPalette;
-                iconProps.customColor = colors.project[_customIconColor] ? colors.project[_customIconColor] : customIconColor;
-            }
+        if(customIconColor) {
+            const _customIconColor = customIconColor as keyof NCoreUIKit.ProjectColorPalette;
+            iconProps.customColor = colors.project[_customIconColor] ? colors.project[_customIconColor] : customIconColor;
         }
+        // }
 
         if (isLoading) {
             if(renderLoading) {
@@ -178,11 +178,11 @@ const Button: FC<IButtonProps> = ({
             return null;
         }
 
-        if(!isDisabled && !isLoading) {
-            if(customTextColor) {
-                titleProps.customColor = customTextColor;
-            }
+        // if(!isDisabled && !isLoading) {
+        if(customTextColor) {
+            titleProps.customColor = customTextColor;
         }
+        // }
 
         return <Text
             variant={currentSize.fontSize}

+ 1 - 1
src/components/dialog/index.tsx

@@ -199,6 +199,7 @@ const Dialog: RefForwardingComponent<IDialogRef, IDialogProps> = ({
         }
 
         return <Button
+            variant="filled"
             type="neutral"
             {...secondaryButtonProps}
             onPress={() => {
@@ -213,7 +214,6 @@ const Dialog: RefForwardingComponent<IDialogRef, IDialogProps> = ({
             spreadBehaviour={contentJustify === "centered" ? "stretch" : "free"}
             title={secondaryButtonProps?.title || localize("cancel")}
             style={secondaryButtonStyle}
-            variant="outline"
         />;
     };
 

+ 8 - 8
src/components/textAreaInput/stylesheet.ts

@@ -170,11 +170,7 @@ const stylesheet = StyleSheet.create({
     },
     overlay: {
         position: "absolute",
-        zIndex: 98,
-        bottom: 0,
-        right: 0,
-        left: 0,
-        top: 0
+        zIndex: 98
     },
     hintTextIcon: {
     },
@@ -229,7 +225,11 @@ export const useStyles = ({
             marginLeft: inlineSpaces.subTitle
         } as Mutable<TextStyle>,
         overlay: {
-            borderRadius: radiuses.form - 1
+            borderRadius: radiuses.form - 1,
+            bottom: -borders.line,
+            right: -borders.line,
+            left: -borders.line,
+            top: -borders.line
         } as Mutable<ViewStyle>,
         titleContainer: {
             marginBottom: spaces.spacingSm
@@ -284,7 +284,7 @@ export const useStyles = ({
     }
 
     if(customBorderColor) {
-        styles.container.borderColor = customBorderColor;
+        styles.content.borderColor = customBorderColor;
     }
 
     if(isFocused && !isDisabled) {
@@ -296,7 +296,7 @@ export const useStyles = ({
     }
 
     if(customColor) {
-        styles.container.backgroundColor = customColor;
+        styles.content.backgroundColor = customColor;
     }
 
     return styles;

+ 2 - 2
src/components/textInput/stylesheet.ts

@@ -269,7 +269,7 @@ export const useStyles = ({
     }
 
     if(customBorderColor) {
-        styles.container.borderColor = customBorderColor;
+        styles.content.borderColor = customBorderColor;
     }
 
     if(isFocused && !isDisabled) {
@@ -281,7 +281,7 @@ export const useStyles = ({
     }
 
     if(customColor) {
-        styles.container.backgroundColor = customColor;
+        styles.content.backgroundColor = customColor;
     }
 
     return styles;

二进制
temp_index.tsx.bak