@omnia/velcron 7.0.513-dev → 7.0.514-dev

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/velcron",
   "license": "MIT",
-  "version": "7.0.513-dev",
+  "version": "7.0.514-dev",
   "description": "Provide Omnia Velcron Stuffs.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/parser/VelcronStyles.js

@@ -53,7 +53,6 @@ class VelcronStyles {
                 }
             }
             if (flexViewDefinition.colorSchema && flexViewDefinition.colorSchema != "") {
-                const color = renderCtx.theming.get.activeColorSchema().base.color;
                 styleBase["backgroundColor"] = renderCtx.theming.get.activeColorSchema().base.color;
             }
         }

package/stores/VelcronStore.d.ts

@@ -1,9 +1,12 @@
-export declare const defineVelcronStore: <TState, TGetters, TActions>(name: string, definition: {
-    state: TState;
-    getters: (state: TState) => TGetters;
-    actions: (state: TState) => TActions;
+export declare const defineVelcronStore: <TState extends {
+    state: object;
+    privateState?: object;
+}, TGetters, TActions>(name: string, definition: {
+    state: () => TState;
+    getters: (state: TState["state"], privateState?: TState["privateState"]) => TGetters;
+    actions: (state: TState["state"], privateState?: TState["privateState"]) => TActions;
 }) => () => {
-    state: TState;
+    state: object;
     get: TGetters;
     actions: TActions;
 };

package/stores/VelcronStore.js

@@ -6,13 +6,13 @@ const stateMap = new Map();
 const defineVelcronStore = (name, definition) => {
     const result = () => {
         if (!stateMap.has(name)) {
-            stateMap.set(name, ReactivitySystem_1.ReactivitySystem.makeReactive(definition.state));
+            stateMap.set(name, ReactivitySystem_1.ReactivitySystem.makeReactive(definition.state()));
         }
         const reactiveState = stateMap.get(name);
         return {
-            state: reactiveState,
-            get: definition.getters(reactiveState),
-            actions: definition.actions(reactiveState)
+            state: reactiveState.state,
+            get: definition.getters(reactiveState.state, reactiveState.privateState),
+            actions: definition.actions(reactiveState.state, reactiveState.privateState)
         };
     };
     return result;

package/stores/VelcronTheming.d.ts

@@ -1,11 +1,9 @@
 import { ColorSchema, ThemeDefinitionV2, TypographyType } from "..";
 export declare const useVelcronThemingStore: () => {
-    state: {
-        currentTheme: ThemeDefinitionV2;
-        activeSchema: string;
-    };
+    state: object;
     get: {
         activeColorSchema: () => ColorSchema;
+        colorSchema: (schema: string) => ColorSchema;
         typography: (name: string) => TypographyType;
         colorFromActiveSchema: (name: string) => string;
     };

package/stores/VelcronTheming.js

@@ -3,39 +3,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useVelcronThemingStore = void 0;
 const __1 = require("..");
 const VelcronStore_1 = require("./VelcronStore");
+let activeSchemaType = "";
 exports.useVelcronThemingStore = (0, VelcronStore_1.defineVelcronStore)("VelcronTheming", {
-    state: {
-        currentTheme: {},
-        activeSchema: ""
+    state() {
+        return {
+            state: {
+                currentTheme: {}
+            }
+        };
     },
     getters(state) {
-        const activeColorSchema = () => {
-            if (state.activeSchema === __1.ColorSchemaTypes.primary) {
+        const colorSchema = (schema) => {
+            if (schema === __1.ColorSchemaTypes.primary) {
                 return state.currentTheme?.primary;
             }
-            else if (state.activeSchema === __1.ColorSchemaTypes.secondary) {
+            else if (schema === __1.ColorSchemaTypes.secondary) {
                 return state.currentTheme?.secondary;
             }
-            else if (state.activeSchema === __1.ColorSchemaTypes.accent1) {
+            else if (schema === __1.ColorSchemaTypes.accent1) {
                 return state.currentTheme?.accent1;
             }
-            else if (state.activeSchema === __1.ColorSchemaTypes.accent2) {
+            else if (schema === __1.ColorSchemaTypes.accent2) {
                 return state.currentTheme?.accent2;
             }
-            else if (state.activeSchema === __1.ColorSchemaTypes.accent3) {
+            else if (schema === __1.ColorSchemaTypes.accent3) {
                 return state.currentTheme?.accent3;
             }
-            else if (state.activeSchema === __1.ColorSchemaTypes.background) {
+            else if (schema === __1.ColorSchemaTypes.background) {
                 return state.currentTheme?.background;
             }
-            else if (state.activeSchema === __1.ColorSchemaTypes.neutral) {
+            else if (schema === __1.ColorSchemaTypes.neutral) {
                 return state.currentTheme?.neutral;
             }
-            else if (state.activeSchema === __1.ColorSchemaTypes.error) {
+            else if (schema === __1.ColorSchemaTypes.error) {
                 return state.currentTheme?.error;
             }
             return state.currentTheme?.background;
         };
+        const activeColorSchema = () => {
+            return colorSchema(activeSchemaType);
+        };
         const typography = (name) => {
             if (name === __1.TypographyTypes.h1) {
                 return state.currentTheme.typography.h1;
@@ -86,6 +93,7 @@ exports.useVelcronThemingStore = (0, VelcronStore_1.defineVelcronStore)("Velcron
         };
         return {
             activeColorSchema,
+            colorSchema,
             typography,
             colorFromActiveSchema
         };
@@ -93,7 +101,7 @@ exports.useVelcronThemingStore = (0, VelcronStore_1.defineVelcronStore)("Velcron
     actions(state) {
         return {
             setActiveSchema(name) {
-                state.activeSchema = name;
+                activeSchemaType = name;
             },
             setTheme(newTheme) {
                 state.currentTheme = newTheme;