dirk-cfx-react 1.1.5 → 1.1.7

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 export { BorderedIcon, BorderedIconProps, ButtonProps, Counter, FloatingParticles, FloatingParticlesProps, InfoBox, InfoBoxProps, InputContainer, InputContainerProps, LevelBanner, LevelPanel, ModalContext, ModalProvider, MotionFlex, MotionIcon, MotionImage, MotionText, NavBar, NavigationContext, NavigationProvider, NavigationStore, ParticleState, ProgressProps, Prompt, PromptButton, PromptModal, SegmentProps, SegmentedControl, SegmentedControlProps, SegmentedProgress, Title, TitleProps, useModal, useModalActions, useNavigation, useNavigationStore } from './components/index.cjs';
-export { InitialFetch, InternalEvent, SkillSettings, UploadImageProps, colorWithAlpha, copyToClipboard, createSkill, fetchNui, gameToMap, getImageShape, initialFetches, internalEvent, isEnvBrowser, isProfanity, latPr100, locale, localeStore, mapCenter, mapToGame, noop, numberToRoman, openLink, registerInitialFetch, runFetches, splitFAString, updatePresignedURL, uploadImage, useAutoFetcher, useProfanityStore } from './utils/index.cjs';
+export { InitialFetch, InternalEvent, SettingsState, SkillSettings, UploadImageProps, colorWithAlpha, copyToClipboard, createSkill, fetchNui, gameToMap, getImageShape, initialFetches, internalEvent, isEnvBrowser, isProfanity, latPr100, locale, localeStore, mapCenter, mapToGame, noop, numberToRoman, openLink, registerInitialFetch, runFetches, splitFAString, updatePresignedURL, uploadImage, useAutoFetcher, useProfanityStore, useSettings } from './utils/index.cjs';
 export { FormProvider, FormState, NuiHandlerSignature, NuiMessageData, TornEdgeSVGFilter, ValidationRules, createFormStore, createScriptSettings, useForm, useNuiEvent, useTornEdges } from './hooks/index.cjs';
 export { DirkProvider, DirkProviderProps } from './providers/index.cjs';
 import 'react/jsx-runtime';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { BorderedIcon, BorderedIconProps, ButtonProps, Counter, FloatingParticles, FloatingParticlesProps, InfoBox, InfoBoxProps, InputContainer, InputContainerProps, LevelBanner, LevelPanel, ModalContext, ModalProvider, MotionFlex, MotionIcon, MotionImage, MotionText, NavBar, NavigationContext, NavigationProvider, NavigationStore, ParticleState, ProgressProps, Prompt, PromptButton, PromptModal, SegmentProps, SegmentedControl, SegmentedControlProps, SegmentedProgress, Title, TitleProps, useModal, useModalActions, useNavigation, useNavigationStore } from './components/index.js';
-export { InitialFetch, InternalEvent, SkillSettings, UploadImageProps, colorWithAlpha, copyToClipboard, createSkill, fetchNui, gameToMap, getImageShape, initialFetches, internalEvent, isEnvBrowser, isProfanity, latPr100, locale, localeStore, mapCenter, mapToGame, noop, numberToRoman, openLink, registerInitialFetch, runFetches, splitFAString, updatePresignedURL, uploadImage, useAutoFetcher, useProfanityStore } from './utils/index.js';
+export { InitialFetch, InternalEvent, SettingsState, SkillSettings, UploadImageProps, colorWithAlpha, copyToClipboard, createSkill, fetchNui, gameToMap, getImageShape, initialFetches, internalEvent, isEnvBrowser, isProfanity, latPr100, locale, localeStore, mapCenter, mapToGame, noop, numberToRoman, openLink, registerInitialFetch, runFetches, splitFAString, updatePresignedURL, uploadImage, useAutoFetcher, useProfanityStore, useSettings } from './utils/index.js';
 export { FormProvider, FormState, NuiHandlerSignature, NuiMessageData, TornEdgeSVGFilter, ValidationRules, createFormStore, createScriptSettings, useForm, useNuiEvent, useTornEdges } from './hooks/index.js';
 export { DirkProvider, DirkProviderProps } from './providers/index.js';
 import 'react/jsx-runtime';

package/dist/index.js

@@ -10,6 +10,14 @@ import hoverSoundUrl from './hover_sound-NBUA222C.mp3';
 import { useClickOutside } from '@mantine/hooks';
 import '@mantine/core/styles.css';
 import '@mantine/notifications/styles.css';
+import './styles/notify.css';
+import './styles/fonts.css';
+import './styles/scrollBar.css';
+import './styles/tornEdge.css';
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { fab } from '@fortawesome/free-brands-svg-icons';
+import { far } from '@fortawesome/free-regular-svg-icons';
+import { fas } from '@fortawesome/free-solid-svg-icons';
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -793,6 +801,33 @@ async function getImageShape(file) {
     img.src = typeof file === "string" ? file : URL.createObjectURL(file);
   });
 }
+var useSettings = create(() => ({
+  hydrated: false,
+  game: "fivem",
+  primaryColor: "dirk",
+  primaryShade: 9,
+  itemImgPath: "",
+  customTheme: [
+    "#f0f4ff",
+    "#d9e3ff",
+    "#bfcfff",
+    "#a6bbff",
+    "#8ca7ff",
+    "#7393ff",
+    "#5a7fff",
+    "#406bff",
+    "#2547ff",
+    "#0b33ff"
+  ]
+}));
+registerInitialFetch("GET_SETTINGS").then((data) => {
+  useSettings.setState({
+    ...data,
+    hydrated: true
+  });
+}).catch(() => {
+  useSettings.setState({ hydrated: true });
+});
 function BorderedIcon(props) {
   const theme2 = useMantineTheme();
   return /* @__PURE__ */ jsx(
@@ -1483,22 +1518,6 @@ function SegmentedProgress(props) {
     }
   );
 }
-var useSettings = create(() => ({
-  hydrated: false,
-  game: "fivem",
-  primaryColor: "dirk",
-  primaryShade: 9,
-  itemImgPath: "",
-  customTheme: {}
-}));
-registerInitialFetch("GET_SETTINGS").then((data) => {
-  useSettings.setState({
-    ...data,
-    hydrated: true
-  });
-}).catch(() => {
-  useSettings.setState({ hydrated: true });
-});
 function Title(props) {
   const game = useSettings((state) => state.game);
   const theme2 = useMantineTheme();
@@ -2372,15 +2391,11 @@ var theme = createTheme({
 var theme_default = theme;
 
 // src/utils/mergeMantineTheme.ts
-var isValidColorScale = (v) => Array.isArray(v) && v.length >= 5 && v.every((c) => typeof c === "string");
+var isValidColorScale = (v) => Array.isArray(v) && v.length === 10 && v.every((shade) => typeof shade === "string");
 function mergeMantineThemeSafe(base, custom, override) {
   const colors = { ...base.colors };
-  for (const [key, value] of Object.entries(custom ?? {})) {
-    if (isValidColorScale(value)) {
-      colors[key] = value;
-    } else {
-      console.warn(`[theme] invalid color ignored: ${key}`, value);
-    }
+  if (custom && isValidColorScale(custom)) {
+    colors["custom"] = custom;
   }
   return {
     ...base,
@@ -2413,6 +2428,7 @@ var DirkErrorBoundary = class extends React3.Component {
     ] });
   }
 };
+library.add(fas, far, fab);
 function DirkProvider({ children, themeOverride }) {
   const {
     hydrated,
@@ -2421,7 +2437,6 @@ function DirkProvider({ children, themeOverride }) {
     customTheme,
     game
   } = useSettings();
-  if (!hydrated) return null;
   const mergedTheme = useMemo(
     () => mergeMantineThemeSafe(
       { ...theme_default, primaryColor, primaryShade },
@@ -2432,6 +2447,7 @@ function DirkProvider({ children, themeOverride }) {
   );
   useEffect(() => {
     document.body.style.fontFamily = game === "rdr3" ? '"Red Dead", sans-serif' : '"Akrobat Regular", sans-serif';
+    console.log(`%cNew Font Applied: ${document.body.style.fontFamily}`, "font-family: " + document.body.style.fontFamily);
   }, [game]);
   const content = isEnvBrowser() ? /* @__PURE__ */ jsx(
     BackgroundImage,
@@ -2445,6 +2461,6 @@ function DirkProvider({ children, themeOverride }) {
   return /* @__PURE__ */ jsx(DirkErrorBoundary, { children: /* @__PURE__ */ jsx(MantineProvider, { theme: mergedTheme, defaultColorScheme: "dark", children: content }) });
 }
 
-export { BorderedIcon, Counter, DirkProvider, FloatingParticles, FormProvider, InfoBox, InputContainer, LevelBanner, LevelPanel, ModalContext, ModalProvider, MotionFlex, MotionIcon, MotionImage, MotionText, NavBar, NavigationContext, NavigationProvider, PromptModal, SegmentedControl, SegmentedProgress, Title, TornEdgeSVGFilter, colorWithAlpha, copyToClipboard, createFormStore, createScriptSettings, createSkill, fetchNui, gameToMap, getImageShape, initialFetches, internalEvent, isEnvBrowser, isProfanity, latPr100, locale, localeStore, mapCenter, mapToGame, noop, numberToRoman, openLink, registerInitialFetch, runFetches, splitFAString, updatePresignedURL, uploadImage, useAutoFetcher, useForm, useModal, useModalActions, useNavigation, useNavigationStore, useNuiEvent, useProfanityStore, useTornEdges };
+export { BorderedIcon, Counter, DirkProvider, FloatingParticles, FormProvider, InfoBox, InputContainer, LevelBanner, LevelPanel, ModalContext, ModalProvider, MotionFlex, MotionIcon, MotionImage, MotionText, NavBar, NavigationContext, NavigationProvider, PromptModal, SegmentedControl, SegmentedProgress, Title, TornEdgeSVGFilter, colorWithAlpha, copyToClipboard, createFormStore, createScriptSettings, createSkill, fetchNui, gameToMap, getImageShape, initialFetches, internalEvent, isEnvBrowser, isProfanity, latPr100, locale, localeStore, mapCenter, mapToGame, noop, numberToRoman, openLink, registerInitialFetch, runFetches, splitFAString, updatePresignedURL, uploadImage, useAutoFetcher, useForm, useModal, useModalActions, useNavigation, useNavigationStore, useNuiEvent, useProfanityStore, useSettings, useTornEdges };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map