dirk-cfx-react 1.1.77 → 1.1.78

package/dist/index.js

@@ -6552,6 +6552,7 @@ function DirkProvider({ children, overideResourceName, themeOverride }) {
     game
   } = useSettings();
   localeStore((s) => s.locales);
+  const [scTheme, setScTheme] = useState(null);
   useLayoutEffect(() => {
     useSettings.setState({
       overideResourceName
@@ -6574,26 +6575,53 @@ function DirkProvider({ children, overideResourceName, themeOverride }) {
   }, []);
   useNuiEvent("UPDATE_DIRK_LIB_SETTINGS", (data) => {
     if (!data || typeof data !== "object") return;
-    const carriesOverrideFlag = Object.prototype.hasOwnProperty.call(data, "themeOverride");
-    if (carriesOverrideFlag) {
-      useSettings.setState(data);
-      return;
-    }
-    const current = useSettings.getState();
-    if (current.themeOverride) {
-      const { primaryColor: _pc, primaryShade: _ps, customTheme: _ct, ...rest } = data;
-      useSettings.setState(rest);
-      return;
-    }
     useSettings.setState(data);
   });
+  useNuiEvent(
+    "UPDATE_SCRIPT_CONFIG",
+    (data) => {
+      if (!data || !data.config || typeof data.config !== "object") return;
+      try {
+        const inst = getScriptConfigInstance();
+        inst.store.setState((prev) => ({ ...prev, ...data.config }));
+      } catch {
+      }
+    }
+  );
+  useEffect(() => {
+    let unsubscribe;
+    try {
+      const inst = getScriptConfigInstance();
+      setScTheme(inst.store.getState()?.theme ?? null);
+      const subscribable = inst.store;
+      if (typeof subscribable.subscribe === "function") {
+        unsubscribe = subscribable.subscribe((s) => {
+          setScTheme(s?.theme ?? null);
+        });
+      }
+      inst.fetchConfig?.().then((full) => {
+        if (full && typeof full === "object") {
+          setScTheme(full.theme ?? null);
+        }
+      }).catch(() => {
+      });
+    } catch {
+    }
+    return () => {
+      unsubscribe?.();
+    };
+  }, []);
+  const overrideActive = scTheme?.useOverride === true;
+  const effectivePrimaryColor = overrideActive ? scTheme.primaryColor ?? primaryColor : primaryColor;
+  const effectivePrimaryShade = overrideActive ? scTheme.primaryShade ?? primaryShade : primaryShade;
+  const effectiveCustomTheme = overrideActive ? scTheme.customTheme ?? customTheme : customTheme;
   const mergedTheme = useMemo(
     () => mergeMantineThemeSafe(
-      { ...theme_default, primaryColor, primaryShade },
-      customTheme,
+      { ...theme_default, primaryColor: effectivePrimaryColor, primaryShade: effectivePrimaryShade },
+      effectiveCustomTheme,
       themeOverride
     ),
-    [primaryColor, primaryShade, customTheme, themeOverride]
+    [effectivePrimaryColor, effectivePrimaryShade, effectiveCustomTheme, themeOverride]
   );
   useEffect(() => {
     document.body.style.fontFamily = game === "rdr3" ? '"Red Dead", sans-serif' : '"Akrobat Regular", sans-serif';