Эх сурвалжийг харах

Bugfix: Assets svg removed.

lfabl 1 сар өмнө
parent
commit
51afff51d5

+ 3 - 2
example/mobile/tsconfig.json

@@ -11,6 +11,7 @@
     "include": [
         "**/*",
         "../src/**/*",
-        "../src/**/*.json"
-, "../../src/assets/svg/nibgatIcon"    ]
+        "../src/**/*.json",
+        "../../src/assets/svg/nibgatIcon"
+    ]
 }

+ 3 - 2
example/web/tsconfig.json

@@ -9,8 +9,9 @@
         "../src/**/*",
         "**/*.json",
         "**/*.tsx",
-        "**/*.ts"
-, "../../src/assets/svg/nibgatIcon"    ],
+        "**/*.ts",
+        "../../src/assets/svg/nibgatIcon"
+    ],
     "exclude": [
         "**/node_modules",
         "**/Pods"

+ 14 - 17
src/components/dateTimePicker/index.tsx

@@ -25,9 +25,6 @@ import {
     NCoreUIKitTheme,
     NCoreUIKitToast
 } from "../../core/hooks";
-import {
-    type NCoreUIKitIcon
-} from "../../types";
 import type {
     IBottomSheetRef
 } from "../bottomSheet/type";
@@ -38,13 +35,14 @@ import {
 } from "rrule";
 import moment from "moment";
 import {
-    BadgeQuestionMarkIcon,
-    BadgeSuccessIcon,
-    BadgeDangerIcon,
-    BadgeAlertIcon,
-    BadgeInfoIcon,
-    CleanIcon
-} from "../../assets/svg";
+    BadgeQuestionMark as BadgeQuestionMarkIcon,
+    BadgeAlert as BadgeAlertIcon,
+    BadgeCheck as BadgeCheckIcon,
+    BadgeInfo as BadgeInfoIcon,
+    CircleX as CircleXIcon,
+    BadgeX as BadgeXIcon,
+    type LucideIcon
+} from "lucide-react-native";
 import {
     uuid
 } from "../../utils";
@@ -54,12 +52,12 @@ import {
     parseRRuleConfig
 } from "../../helpers";
 
-const DateTimePickerTypeIcon: Record<Exclude<DateTimePickerType, "default">, NCoreUIKitIcon> = {
+const DateTimePickerTypeIcon: Record<Exclude<DateTimePickerType, "default">, LucideIcon> = {
     "question": BadgeQuestionMarkIcon,
-    "success": BadgeSuccessIcon,
+    "success": BadgeCheckIcon,
     "warning": BadgeAlertIcon,
-    "danger": BadgeDangerIcon,
-    "info": BadgeInfoIcon
+    "info": BadgeInfoIcon,
+    "danger": BadgeXIcon
 };
 
 const DateTimePicker = ({
@@ -605,7 +603,7 @@ const DateTimePicker = ({
                 setTempDate(undefined);
             }}
         >
-            <CleanIcon
+            <CircleXIcon
                 color="mid"
                 size={20}
             />
@@ -682,8 +680,7 @@ const DateTimePicker = ({
         const CurrentHintIcon = DateTimePickerTypeIcon[type === "default" ? "question" : type];
 
         return <CurrentHintIcon
-            customColor={isDisabled ? colors.system.state.content.disabled[styleType] : undefined}
-            color={currentType.hintTextIconColor}
+            color={isDisabled ? colors.system.state.content.disabled[styleType] : colors.content.icon[currentType.hintTextIconColor]}
             size={20}
             style={[
                 hintTextIconStyle,

+ 14 - 17
src/components/selectBox/index.tsx

@@ -26,33 +26,31 @@ import {
     NCoreUIKitTheme,
     NCoreUIKitToast
 } from "../../core/hooks";
-import {
-    type NCoreUIKitIcon
-} from "../../types";
 import type {
     IBottomSheetRef
 } from "../bottomSheet/type";
 import type ITextProps from "../text/type";
 import {
-    BadgeQuestionMarkIcon,
-    BadgeSuccessIcon,
-    BadgeDangerIcon,
-    BadgeAlertIcon,
-    BadgeInfoIcon,
-    CleanIcon
-} from "../../assets/svg";
+    BadgeQuestionMark as BadgeQuestionMarkIcon,
+    BadgeAlert as BadgeAlertIcon,
+    BadgeCheck as BadgeCheckIcon,
+    BadgeInfo as BadgeInfoIcon,
+    CircleX as CircleXIcon,
+    BadgeX as BadgeXIcon,
+    type LucideIcon
+} from "lucide-react-native";
 import {
     uuid
 } from "../../utils";
 import SelectSheet from "../selectSheet";
 import Text from "../text";
 
-const SelectBoxTypeIcon: Record<Exclude<SelectBoxType, "default">, NCoreUIKitIcon> = {
+const SelectBoxTypeIcon: Record<Exclude<SelectBoxType, "default">, LucideIcon> = {
     "question": BadgeQuestionMarkIcon,
-    "success": BadgeSuccessIcon,
+    "success": BadgeCheckIcon,
     "warning": BadgeAlertIcon,
-    "danger": BadgeDangerIcon,
-    "info": BadgeInfoIcon
+    "info": BadgeInfoIcon,
+    "danger": BadgeXIcon
 };
 
 function SelectBox<T>({
@@ -569,7 +567,7 @@ function SelectBox<T>({
                 setTempSelectedItems([]);
             }}
         >
-            <CleanIcon
+            <CircleXIcon
                 color="mid"
                 size={20}
             />
@@ -640,8 +638,7 @@ function SelectBox<T>({
         const CurrentHintIcon = SelectBoxTypeIcon[type === "default" ? "question" : type];
 
         return <CurrentHintIcon
-            customColor={isDisabled ? colors.system.state.content.disabled[styleType] : undefined}
-            color={currentType.hintTextIconColor}
+            color={isDisabled ? colors.system.state.content.disabled[styleType] : colors.content.icon[currentType.hintTextIconColor]}
             size={20}
             style={[
                 hintTextIconStyle,