Procházet zdrojové kódy

Merge branch 'release/1.0.0-pre-alpha.54'

lfabl před 1 měsícem
rodič
revize
3ebe31f13e

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
     "name": "ncore-ui-kit",
-    "version": "1.0.0-pre-alpha.53",
+    "version": "1.0.0-pre-alpha.54",
     "description": "NİBGAT® | NCore - UI Kit for React-Native Mobile Apps.",
     "main": "./lib/module/index.js",
     "types": "./lib/typescript/src/index.d.ts",

+ 7 - 3
src/components/siteLogo/index.tsx

@@ -24,14 +24,17 @@ const SiteLogo = ({
     logoBackgroundColor = "default",
     isWorkWithFlex1 = true,
     isShowBorder = false,
+    subTitleCustomColor,
     isCustomImageSize,
     isShowIcon = true,
     isWorkWithAction,
+    titleCustomColor,
     image: ImageProp,
     backgroundColor,
     subTitleVariant,
     icon: IconProp,
     size = "large",
+    subTitleColor,
     titleVariant,
     imageSource,
     customTheme,
@@ -188,10 +191,10 @@ const SiteLogo = ({
         >
             <Text
                 variant={titleVariant ? titleVariant : currentSize.titleSize}
-                customColor={titleColor}
+                color={titleColor ? titleColor : "high"}
+                customColor={titleCustomColor}
                 ellipsizeMode="tail"
                 numberOfLines={1}
-                color="high"
                 style={{
                     width: "100%"
                 }}
@@ -202,9 +205,10 @@ const SiteLogo = ({
                 subTitle ?
                     <Text
                         variant={subTitleVariant ? subTitleVariant : currentSize.subTitleSize}
+                        color={subTitleColor ? subTitleColor : "low"}
+                        customColor={subTitleCustomColor}
                         ellipsizeMode="tail"
                         numberOfLines={1}
-                        color="low"
                         style={{
                             width: "100%"
                         }}

+ 4 - 1
src/components/siteLogo/type.ts

@@ -54,7 +54,8 @@ interface ISiteLogoProps {
     backgroundColor?: keyof NCoreUIKit.ContainerContentColors | "transparent";
     borderColor?: keyof NCoreUIKit.BorderContentColors | "transparent";
     logoBackgroundColor?: keyof NCoreUIKit.ContainerContentColors;
-    iconColor?: keyof NCoreUIKit.ProjectColorPalette;
+    subTitleCustomColor?: keyof NCoreUIKit.ProjectColorPalette;
+    titleCustomColor?: keyof NCoreUIKit.ProjectColorPalette;
     customTheme?: {
         gapPropagation?: keyof NCoreUIKit.GapPropagationKey;
         sharpness?: keyof NCoreUIKit.SharpnessKey;
@@ -63,6 +64,8 @@ interface ISiteLogoProps {
     };
     style?: StyleProp<ViewStyle>[] | StyleProp<ViewStyle>;
     imageSpace?: keyof NCoreUIKit.ActivePalette["spaces"];
+    subTitleColor?: keyof NCoreUIKit.TextContentColors;
+    iconColor?: keyof NCoreUIKit.ProjectColorPalette;
     titleColor?: keyof NCoreUIKit.TextContentColors;
     subTitleVariant?: keyof NCoreUIKit.Typography;
     titleVariant?: keyof NCoreUIKit.Typography;