@vnejs/plugins.view.coralina.settings.defaults 0.1.3 → 0.1.5

package/modules/controller.js

@@ -1,12 +1,5 @@
 import { ModuleController } from "@vnejs/module.components";
 
-const mapField = (field) => ({ ...field, isNotRender: typeof field.isNotShowFunc === "function" ? field.isNotShowFunc() : false });
-const mapTabInfo = ({ ...tabInfo }) => {
-  if (tabInfo.options) tabInfo.options = [...tabInfo.options.map(mapField)];
-
-  return tabInfo;
-};
-
 export class SettingsDefaultsController extends ModuleController {
   name = "settings.defaults.controller";
 
@@ -15,14 +8,19 @@ export class SettingsDefaultsController extends ModuleController {
 
   subscribe = () => {
     this.on(this.EVENTS.SETTINGS_DEFAULTS.SHOW, this.onShow);
+    this.on(this.EVENTS.SETTINGS_DEFAULTS.HIDE, this.onHide);
 
     this.on(this.EVENTS.LOCS.LANG_CHANGED, this.onSettingChange);
     this.on(this.EVENTS.SETTINGS.CHANGED, this.onSettingChange);
+
+    this.on(this.EVENTS.MEMORY.CLEARED, this.onMemoryCleared);
   };
 
-  beforeShow = async () => this.updateState({ bgSrc: (await this.loadBgMedia()).src, tab: mapTabInfo(this.PARAMS.SETTINGS_VIEW.TABS.DEFAULT), currentTab: 0 });
+  beforeShow = async () => this.updateState({ bgSrc: (await this.loadBgMedia()).src, tab: this.PARAMS.SETTINGS_VIEW.TABS.DEFAULT, currentTab: 0 });
 
   emitFunc = (func) => func({ SETTINGS: this.SETTINGS, CONST: this.CONST, platform: window.VneCore.getPlatform() });
 
   onSettingChange = () => this.state.isShow && this.updateViewFast();
+
+  onMemoryCleared = async () => this.updateStateAndViewFast({ bgSrc: (await this.loadBgMedia()).src });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.view.coralina.settings.defaults",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/view/index.jsx

@@ -9,41 +9,37 @@ const SettingsDefaults = ({ store, onMount, ...props } = {}) => {
   useEffect(() => store.subscribe(setState), []);
   useEffect(() => void onMount(), []);
 
+  console.log(11111, props);
+
   const mapFields = useCallback(
-    ({ locKey = "", type = "", settingKey = "", options = [], titleToggledLocKey = "", titleUntoggledLocKey = "", ...fieldProps } = {}) => {
+    ({ locKey = "", type = "", settingKey = "", options = [], titleToggledLocKey = "", titleUntoggledLocKey = "", valueMap = "", ...props2 } = {}) => {
       const onChange = (value) => props.emit(props.EVENTS.SETTINGS.SET, { name: settingKey, value });
 
       const titles = { title: locs[locKey], titleToggled: locs[titleToggledLocKey], titleUntoggled: locs[titleUntoggledLocKey] };
 
-      return { ...titles, value: props.shared.settings[settingKey], type, onChange, props: fieldProps, options };
+      const valueMapReal = valueMap ? props.PARAMS.SETTINGS_VIEW.VALUE_MAPS[valueMap] : null;
+
+      return { ...titles, value: props.shared.settings[settingKey], type, onChange, props: props2, options, valueMap: valueMapReal };
     },
     [locs],
   );
   const onAccept = useCallback(() => props.emit(props.EVENTS.SETTINGS_DEFAULTS.CONFIRM), []);
 
-  const settings = useMemo(() => (tab.fields ? tab.fields.map(mapFields) : []), [tab, mapFields]);
+  const settings = tab.fields ? tab.fields.map(mapFields) : [];
 
-  const propsTitle = useMemo(() => ({ ...props.PARAMS.SETTINGS_DEFAULTS_VIEW.VIEW_PROPS.title, text: locs[tab.titleLocKey] }), [locs, tab]);
-  const propsSettings = useMemo(() => ({ ...props.PARAMS.SETTINGS_DEFAULTS_VIEW.VIEW_PROPS.settings, settings }), [settings]);
-  const propsAccept = useMemo(
-    () => ({ ...props.PARAMS.SETTINGS_DEFAULTS_VIEW.VIEW_PROPS.accept, text: locs[tab.acceptLocKey], onClick: onAccept }),
-    [locs, tab],
-  );
+  const propsByView = props.PARAMS.SETTINGS_DEFAULTS_VIEW.VIEW_PROPS;
+
+  const propsScreen = useMemo(() => ({ ...propsByView.screen, isShow, bgSrc }), [isShow, bgSrc]);
+  const propsTitle = useMemo(() => ({ ...propsByView.title, text: locs[tab.titleLocKey] }), [locs, tab]);
+  const propsSettings = useMemo(() => ({ ...propsByView.settings, settings, selectedIndex: 0, selectedIndexInner: 0 }), [settings]);
+  const propsAccept = useMemo(() => ({ ...propsByView.accept, text: locs[tab.acceptLocKey], onClick: onAccept }), [locs, tab]);
 
   return (
-    <Screen
-      {...props.PARAMS.SETTINGS_DEFAULTS_VIEW.VIEW_PROPS.screen}
-      isShow={isShow}
-      bgSrc={bgSrc}
-    >
-      <PositionBox {...props.PARAMS.SETTINGS_DEFAULTS_VIEW.VIEW_PROPS.position}>
-        <Flex {...props.PARAMS.SETTINGS_DEFAULTS_VIEW.VIEW_PROPS.flex}>
+    <Screen {...propsScreen}>
+      <PositionBox {...propsByView.position}>
+        <Flex {...propsByView.flex}>
           <Text {...propsTitle} />
-          <Settings
-            {...propsSettings}
-            selectedIndex={0}
-            selectedIndexInner={0}
-          />
+          <Settings {...propsSettings} />
           <Text {...propsAccept} />
         </Flex>
       </PositionBox>