dirk-cfx-react 1.1.14 → 1.1.16

package/dist/index.js

@@ -168,11 +168,11 @@ var colorNames = {
   Yellow: { r: 255, g: 255, b: 0 },
   YellowGreen: { r: 154, g: 205, b: 50 }
 };
-function colorWithAlpha(color, alpha4) {
+function colorWithAlpha(color, alpha5) {
   const lowerCasedColor = color.toLowerCase();
   if (colorNames[lowerCasedColor]) {
     const rgb = colorNames[lowerCasedColor];
-    return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${alpha4})`;
+    return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${alpha5})`;
   }
   if (/^#([A-Fa-f0-9]{6})$/.test(color)) {
     const hex = color.slice(1);
@@ -180,12 +180,12 @@ function colorWithAlpha(color, alpha4) {
     const r = bigint >> 16 & 255;
     const g = bigint >> 8 & 255;
     const b = bigint & 255;
-    return `rgba(${r}, ${g}, ${b}, ${alpha4})`;
+    return `rgba(${r}, ${g}, ${b}, ${alpha5})`;
   }
   if (/^rgb\((\d{1,3}), (\d{1,3}), (\d{1,3})\)$/.test(color)) {
     const result = color.match(/^rgb\((\d{1,3}), (\d{1,3}), (\d{1,3})\)$/);
     if (result) {
-      return `rgba(${result[1]}, ${result[2]}, ${result[3]}, ${alpha4})`;
+      return `rgba(${result[1]}, ${result[2]}, ${result[3]}, ${alpha5})`;
     }
   }
   return color;
@@ -1830,7 +1830,7 @@ function Modal() {
             boxShadow: theme2.shadows.xl,
             zIndex: 2100
           },
-          bg: "rgba(48, 48, 48, 0.84)",
+          bg: alpha(theme2.colors.dark[9], 0.9),
           initial: { scale: 0.8, opacity: 0, transform: "translate(-50%, -50%)" },
           animate: { scale: 1, opacity: 1, transform: "translate(-50%, -50%)" },
           exit: { scale: 0.8, opacity: 0, transform: "translate(-50%, -50%)" },
@@ -2025,6 +2025,7 @@ function createFormStore(initialValues, validationRules, onSubmit) {
     initialValues,
     values: initialValues,
     errors: {},
+    partialChanged: {},
     canBack: false,
     canForward: false,
     changedFields: [],
@@ -2039,25 +2040,34 @@ function createFormStore(initialValues, validationRules, onSubmit) {
     },
     resetChangeCount: () => {
       changed.clear();
-      set({ changedFields: [], changedCount: 0 });
+      set({ changedFields: [], changedCount: 0, partialChanged: {} });
     },
     setInitialValues: (newInitialValues) => set({ initialValues: newInitialValues }),
     setValue: (path, value, options) => {
-      const currentValues = get().values;
+      const state = get();
+      const currentValues = state.values;
       const newValues = setNested(currentValues, path, value);
-      const oldValue = getNested(get().initialValues, path);
+      const oldValue = getNested(state.initialValues, path);
+      const hasChanged = value !== oldValue;
       history.push(currentValues);
       future.length = 0;
-      if (value !== oldValue) changed.add(path);
-      else changed.delete(path);
+      let newPartial = state.partialChanged;
+      if (hasChanged) {
+        changed.add(path);
+        newPartial = setNested(newPartial, path, value);
+      } else {
+        changed.delete(path);
+        newPartial = deleteNested(newPartial, path);
+      }
       set({
         values: newValues,
+        partialChanged: newPartial,
         canBack: history.length > 0,
         canForward: false,
         changedFields: Array.from(changed),
         changedCount: changed.size
       });
-      if (options?.validate == false) return;
+      if (options?.validate === false) return;
       const rule = flatRules[path];
       if (!rule) return;
       Promise.resolve(runRule(rule, value, newValues)).then((error2) => {
@@ -2105,6 +2115,7 @@ function createFormStore(initialValues, validationRules, onSubmit) {
       set({
         values: initialValues,
         errors: {},
+        partialChanged: {},
         canBack: false,
         canForward: false,
         changedFields: [],
@@ -2115,14 +2126,19 @@ function createFormStore(initialValues, validationRules, onSubmit) {
       if (!history.length) return;
       const prev = history.pop();
       future.push(get().values);
-      changed.clear();
       const initial = get().initialValues;
-      for (const key in prev) {
-        if (JSON.stringify(prev[key]) !== JSON.stringify(initial[key]))
-          changed.add(key);
+      let partial = {};
+      changed.clear();
+      for (const path of Object.keys(flatRules)) {
+        const val = getNested(prev, path);
+        if (val !== getNested(initial, path)) {
+          changed.add(path);
+          partial = setNested(partial, path, val);
+        }
       }
       set({
         values: prev,
+        partialChanged: partial,
         canBack: history.length > 0,
         canForward: true,
         changedFields: Array.from(changed),
@@ -2133,14 +2149,19 @@ function createFormStore(initialValues, validationRules, onSubmit) {
       if (!future.length) return;
       const next = future.pop();
       history.push(get().values);
-      changed.clear();
       const initial = get().initialValues;
-      for (const key in next) {
-        if (JSON.stringify(next[key]) !== JSON.stringify(initial[key]))
-          changed.add(key);
+      let partial = {};
+      changed.clear();
+      for (const path of Object.keys(flatRules)) {
+        const val = getNested(next, path);
+        if (val !== getNested(initial, path)) {
+          changed.add(path);
+          partial = setNested(partial, path, val);
+        }
       }
       set({
         values: next,
+        partialChanged: partial,
         canBack: true,
         canForward: future.length > 0,
         changedFields: Array.from(changed),