dirk-cfx-react 1.1.92 → 1.1.93

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 export { AccessOverrideSection, AccessOverrideSectionProps, AccessOverrideValue, AccountSelect, AccountSelectProps, ActiveTool, AdminPageTitle, AdminPageTitleProps, AnimPostFxSelect, AnimPostFxSelectProps, AsyncSaveButton, BlipColorSelect, BlipColorSelectProps, BlipDisplaySelect, BlipDisplaySelectProps, BlipIconSelect, BlipIconSelectProps, BlipMarker, BlipMarkerProps, BorderedIcon, BorderedIconProps, ButtonProps, ConfigPanel, ConfigPanelProps, ConfirmModal, ConfirmModalProps, ControlMultiSelect, ControlMultiSelectProps, ControlSelect, ControlSelectProps, Counter, DiscordRole, DiscordRoleSelect, DiscordRoleSelectProps, DoorPickerButton, FiveMControls, FiveMKeyBindInput, FloatingParticles, FloatingParticlesProps, FrameworkAccount, GroupName, GroupNameProps, GroupRank, GroupRankProps, GroupSelect, GroupSelectProps, GroupType, GroupValue, InfoBox, InfoBoxProps, InputContainer, InputContainerProps, InstructionKey, InstructionPanel, InstructionPanelProps, LevelBanner, LevelPanel, Map, MapLayer, MapProps, MapStyle, MissingItemsBanner, Modal, ModalContext, ModalProps, ModalProvider, MotionFlex, MotionIcon, MotionImage, MotionText, NavBar, NavItem, NavigationContext, NavigationProvider, NavigationStore, ParticleState, PickedDoor, PickedDoorGroup, PlayerSelect, PlayerSelectProps, PositionPicker, PositionPickerProps, ProgressProps, Prompt, PromptButton, PromptModal, ScenarioSelect, ScenarioSelectProps, SegmentProps, SegmentedControl, SegmentedControlProps, SegmentedProgress, SelectItem, SelectItemProps, StoreModalProps, SwitchPanel, SwitchPanelProps, TestBed, TestBedItem, TestBedPlacement, TestBedProps, ThemeOverrideSection, ThemeOverrideSectionProps, Title, TitleProps, TitleSize, Vector4DeleteButton, Vector4Display, Vector4Value, WorldPositionGotoButton, WorldPositionPicker, WorldPositionPickerSlot, WorldPositionSetButton, ZoomControls, blipUrl, blipUrlForSprite, getBlipColor, getBlipEntry, useAdminToolStore, useMissingItemsAudit, useModal, useModalActions, useNavigation, useNavigationStore, usePickDoor } from './components/index.cjs';
 export { FrameworkGrade, FrameworkGroup, GTA_CONTROLS, GTA_CONTROL_GROUP_ORDER, GtaControl, GtaControlGroup, INPUT_MAPPER_KEYS_BY_PRIMARY, INPUT_MAPPER_PRIMARY_OPTIONS, InitialFetch, InternalEvent, InventoryItem, InventoryItems, SettingsState, SkillSettings, UploadImageProps, colorWithAlpha, copyToClipboard, createSkill, ensureFrameworkGroups, extractDefaults, fetchLuaTable, fetchNui, formatGtaControl, gameToMap, getGtaControl, getImageShape, getItemImageUrl, initialFetches, internalEvent, isEnvBrowser, isProfanity, latPr100, locale, localeStore, mapCenter, mapToGame, noop, numberToRoman, openLink, registerInitialFetch, registerInitialLuaTableFetch, runFetches, selectAllGroups, splitFAString, updatePresignedURL, uploadImage, useAutoFetcher, useFrameworkGroups, useItems, useItemsList, useProfanityStore, useSettings } from './utils/index.cjs';
-export { FormProvider, FormState, NuiHandlerSignature, NuiMessageData, ScriptConfigHistoryChange, ScriptConfigHistoryEntry, ScriptConfigHistoryRequest, ScriptConfigHistoryResponse, ScriptConfigInstance, TornEdgeSVGFilter, ValidationRules, ValidatorFn, clearAdminState, createFormStore, createScriptConfig, getScriptConfigInstance, useAdminState, useAudio, useForm, useFormActions, useFormError, useFormErrors, useFormField, useFormFields, useNuiEvent, useTornEdges, useValidModels } from './hooks/index.cjs';
+export { FormProvider, FormState, NuiHandlerSignature, NuiMessageData, ScriptConfigHistoryChange, ScriptConfigHistoryEntry, ScriptConfigHistoryRequest, ScriptConfigHistoryResponse, ScriptConfigInstance, ServerOnlyScriptConfigResponse, TornEdgeSVGFilter, ValidationRules, ValidatorFn, clearAdminState, createFormStore, createScriptConfig, getScriptConfigInstance, useAdminState, useAudio, useForm, useFormActions, useFormError, useFormErrors, useFormField, useFormFields, useNuiEvent, useTornEdges, useValidModels } from './hooks/index.cjs';
 export { P as Player, U as UsePlayersOptions, a as UsePlayersResult, u as usePlayers } from './usePlayers-BlGBBevs.cjs';
 export { DirkProvider, DirkProviderProps, dirkQueryClient } from './providers/index.cjs';
 import { z } from 'zod';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { AccessOverrideSection, AccessOverrideSectionProps, AccessOverrideValue, AccountSelect, AccountSelectProps, ActiveTool, AdminPageTitle, AdminPageTitleProps, AnimPostFxSelect, AnimPostFxSelectProps, AsyncSaveButton, BlipColorSelect, BlipColorSelectProps, BlipDisplaySelect, BlipDisplaySelectProps, BlipIconSelect, BlipIconSelectProps, BlipMarker, BlipMarkerProps, BorderedIcon, BorderedIconProps, ButtonProps, ConfigPanel, ConfigPanelProps, ConfirmModal, ConfirmModalProps, ControlMultiSelect, ControlMultiSelectProps, ControlSelect, ControlSelectProps, Counter, DiscordRole, DiscordRoleSelect, DiscordRoleSelectProps, DoorPickerButton, FiveMControls, FiveMKeyBindInput, FloatingParticles, FloatingParticlesProps, FrameworkAccount, GroupName, GroupNameProps, GroupRank, GroupRankProps, GroupSelect, GroupSelectProps, GroupType, GroupValue, InfoBox, InfoBoxProps, InputContainer, InputContainerProps, InstructionKey, InstructionPanel, InstructionPanelProps, LevelBanner, LevelPanel, Map, MapLayer, MapProps, MapStyle, MissingItemsBanner, Modal, ModalContext, ModalProps, ModalProvider, MotionFlex, MotionIcon, MotionImage, MotionText, NavBar, NavItem, NavigationContext, NavigationProvider, NavigationStore, ParticleState, PickedDoor, PickedDoorGroup, PlayerSelect, PlayerSelectProps, PositionPicker, PositionPickerProps, ProgressProps, Prompt, PromptButton, PromptModal, ScenarioSelect, ScenarioSelectProps, SegmentProps, SegmentedControl, SegmentedControlProps, SegmentedProgress, SelectItem, SelectItemProps, StoreModalProps, SwitchPanel, SwitchPanelProps, TestBed, TestBedItem, TestBedPlacement, TestBedProps, ThemeOverrideSection, ThemeOverrideSectionProps, Title, TitleProps, TitleSize, Vector4DeleteButton, Vector4Display, Vector4Value, WorldPositionGotoButton, WorldPositionPicker, WorldPositionPickerSlot, WorldPositionSetButton, ZoomControls, blipUrl, blipUrlForSprite, getBlipColor, getBlipEntry, useAdminToolStore, useMissingItemsAudit, useModal, useModalActions, useNavigation, useNavigationStore, usePickDoor } from './components/index.js';
 export { FrameworkGrade, FrameworkGroup, GTA_CONTROLS, GTA_CONTROL_GROUP_ORDER, GtaControl, GtaControlGroup, INPUT_MAPPER_KEYS_BY_PRIMARY, INPUT_MAPPER_PRIMARY_OPTIONS, InitialFetch, InternalEvent, InventoryItem, InventoryItems, SettingsState, SkillSettings, UploadImageProps, colorWithAlpha, copyToClipboard, createSkill, ensureFrameworkGroups, extractDefaults, fetchLuaTable, fetchNui, formatGtaControl, gameToMap, getGtaControl, getImageShape, getItemImageUrl, initialFetches, internalEvent, isEnvBrowser, isProfanity, latPr100, locale, localeStore, mapCenter, mapToGame, noop, numberToRoman, openLink, registerInitialFetch, registerInitialLuaTableFetch, runFetches, selectAllGroups, splitFAString, updatePresignedURL, uploadImage, useAutoFetcher, useFrameworkGroups, useItems, useItemsList, useProfanityStore, useSettings } from './utils/index.js';
-export { FormProvider, FormState, NuiHandlerSignature, NuiMessageData, ScriptConfigHistoryChange, ScriptConfigHistoryEntry, ScriptConfigHistoryRequest, ScriptConfigHistoryResponse, ScriptConfigInstance, TornEdgeSVGFilter, ValidationRules, ValidatorFn, clearAdminState, createFormStore, createScriptConfig, getScriptConfigInstance, useAdminState, useAudio, useForm, useFormActions, useFormError, useFormErrors, useFormField, useFormFields, useNuiEvent, useTornEdges, useValidModels } from './hooks/index.js';
+export { FormProvider, FormState, NuiHandlerSignature, NuiMessageData, ScriptConfigHistoryChange, ScriptConfigHistoryEntry, ScriptConfigHistoryRequest, ScriptConfigHistoryResponse, ScriptConfigInstance, ServerOnlyScriptConfigResponse, TornEdgeSVGFilter, ValidationRules, ValidatorFn, clearAdminState, createFormStore, createScriptConfig, getScriptConfigInstance, useAdminState, useAudio, useForm, useFormActions, useFormError, useFormErrors, useFormField, useFormFields, useNuiEvent, useTornEdges, useValidModels } from './hooks/index.js';
 export { P as Player, U as UsePlayersOptions, a as UsePlayersResult, u as usePlayers } from './usePlayers-BlGBBevs.js';
 export { DirkProvider, DirkProviderProps, dirkQueryClient } from './providers/index.js';
 import { z } from 'zod';

package/dist/index.js

@@ -4678,6 +4678,21 @@ function mergeMantineThemeSafe(base, custom, override) {
     }
   };
 }
+function isPlainObject2(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function deepMerge(base, patch) {
+  if (!isPlainObject2(base) || !isPlainObject2(patch)) {
+    return patch ?? base;
+  }
+  const out = { ...base };
+  for (const key of Object.keys(patch)) {
+    const patchVal = patch[key];
+    const baseVal = out[key];
+    out[key] = isPlainObject2(baseVal) && isPlainObject2(patchVal) ? deepMerge(baseVal, patchVal) : patchVal;
+  }
+  return out;
+}
 function changedTopLevelSections(changedFields) {
   if (!changedFields || changedFields.length === 0) return [];
   const sections = /* @__PURE__ */ new Set();
@@ -4724,6 +4739,24 @@ function createScriptConfig(defaultValue) {
     }
     return null;
   };
+  const fetchServerOnlyScriptConfig = async () => {
+    try {
+      const response = await fetchNui(
+        "GET_SERVER_ONLY_SCRIPT_CONFIG"
+      );
+      if (response?.success && response.data) {
+        if (typeof response.data.clientVersion === "number") {
+          clientVersion = response.data.clientVersion;
+        }
+        const sliver = response.data.serverOnly;
+        const merged = deepMerge(store2.getState(), sliver ?? {});
+        store2.setState(() => merged);
+        return merged;
+      }
+    } catch {
+    }
+    return null;
+  };
   const updateScriptConfig = async (newConfig, changedFields) => {
     store2.setState((prev) => ({ ...prev, ...newConfig }));
     const sections = changedTopLevelSections(changedFields);
@@ -4751,10 +4784,7 @@ function createScriptConfig(defaultValue) {
   const resetConfig = async () => {
     const response = await fetchNui("RESET_SCRIPT_CONFIG");
     if (response?.success) {
-      const fresh = await fetchScriptConfig();
-      if (fresh) {
-        store2.setState(() => fresh);
-      }
+      await fetchServerOnlyScriptConfig();
     }
     return response;
   };
@@ -4763,9 +4793,10 @@ function createScriptConfig(defaultValue) {
     updateConfig: updateScriptConfig,
     resetConfig,
     getHistory: getScriptConfigHistory,
-    fetchConfig: fetchScriptConfig
+    fetchConfig: fetchScriptConfig,
+    fetchServerOnly: fetchServerOnlyScriptConfig
   };
-  return { store: store2, updateScriptConfig, resetConfig, getScriptConfigHistory, useScriptConfigHooks, fetchScriptConfig };
+  return { store: store2, updateScriptConfig, resetConfig, getScriptConfigHistory, useScriptConfigHooks, fetchScriptConfig, fetchServerOnlyScriptConfig };
 }
 var DirkErrorBoundary = class extends React4.Component {
   constructor() {
@@ -4952,12 +4983,6 @@ function DirkProvider({ children, overideResourceName, themeOverride }) {
           setScTheme(s?.theme ?? null);
         });
       }
-      inst.fetchConfig?.().then((full) => {
-        if (full && typeof full === "object") {
-          setScTheme(full.theme ?? null);
-        }
-      }).catch(() => {
-      });
     } catch {
     }
     return () => {
@@ -5577,11 +5602,11 @@ function cloneConfig(value) {
   return JSON.parse(JSON.stringify(value));
 }
 function ServerOnlyFetcher() {
-  const { fetchConfig } = getScriptConfigInstance();
+  const { fetchServerOnly } = getScriptConfigInstance();
   const { reinitialize } = useFormActions();
   useEffect(() => {
     let cancelled = false;
-    fetchConfig().then((full) => {
+    fetchServerOnly().then((full) => {
       if (!cancelled && full) reinitialize(full);
     }).catch(() => {
     });