plain-design 1.0.0-beta.110 → 1.0.0-beta.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.110",
+  "version": "1.0.0-beta.112",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",
@@ -45,7 +45,7 @@
     "@babel/preset-env": "7.23.7",
     "@babel/preset-react": "7.23.3",
     "@babel/preset-typescript": "7.23.3",
-    "@peryl/react-compose": "0.0.203",
+    "@peryl/react-compose": "0.0.205",
     "@types/classnames": "^2.2.11",
     "@types/react": "18.2.4",
     "@types/react-dom": "18.2.4",

package/src/packages/components/Cascade/createCascadePopper.tsx

@@ -12,6 +12,7 @@ import {tStyleComputed} from "../../uses/useStyle";
 import {getTableRowHeight} from "../Table/table/utils/table.utils";
 import {PlcIndex} from "../Table/standard/PlcIndex";
 import {createPopupEditor} from "../usePopupEditor";
+import {tEditControl} from "../../uses/useEdit";
 
 export function createCascadePopper(
   {
@@ -31,7 +32,7 @@ export function createCascadePopper(
     getPublicPopperAttrs: () => any,
     onPopperClose: () => void,
     onPopperShow?: () => void,
-    editControl: { editComputed: { value: { editable: boolean } } }
+    editControl: tEditControl
     refs: { input: typeof Input.use.class | null | undefined },
     scopeSlots: any,
     getTreeAttrs: () => any,

package/src/packages/uses/useEdit.ts

@@ -15,6 +15,7 @@ export const EditProps = {
 } as const;
 
 export interface EditProvideData {
+  editable: boolean | null,
   disabled: boolean | null,
   readonly: boolean | null,
   loading: boolean | null,
@@ -32,7 +33,10 @@ export const useEdit = useFunctionWrapper(
 
     const editState = reactive({ loading: null as null | boolean });
 
-    const editComputed = computed(() => {
+    const editComputed = computed((): EditProvideData => {
+
+      if (ctx.isDestroyed) {return {} as EditProvideData;}
+
       const {
         disabled,
         readonly,
@@ -40,7 +44,7 @@ export const useEdit = useFunctionWrapper(
         placeholder
       } = ctx.props as any as EditProvideData;
 
-      let data = { disabled, readonly, loading, placeholder };
+      let data: EditProvideData = { disabled, readonly, loading, placeholder, editable: false };
 
       if (data.disabled == null) data.disabled = !!parentEditComputed ? parentEditComputed.value.disabled : false;
       if (data.readonly == null) data.readonly = !!parentEditComputed ? parentEditComputed.value.readonly : false;

package/src/packages/uses/useFunctionWrapper.ts

@@ -1,4 +1,5 @@
-import {getCurrentDesignInstance} from '@peryl/react-compose';
+import {getCurrentDesignInstance, onBeforeUnmount} from '@peryl/react-compose';
+import {delay} from "@peryl/utils/delay";
 
 type Shift<T> = T extends [infer L, ...infer R] ? R : T
 
@@ -9,6 +10,7 @@ export function useFunctionWrapper<T extends (ctx: any, ...args: any[]) => any>(
   return (...args) => {
     const ctx = getCurrentDesignInstance() as any;
     if (!ctx._use) ctx._use = {};
+    onBeforeUnmount(() => delay().then(() => {delete ctx._use;}));
 
     if (!!ctx._use[key]) {
       throw new Error(`use ${key} can only be executed once!`);

package/src/packages/uses/useStyle.tsx

@@ -47,6 +47,8 @@ export const useStyle = useFunctionWrapper('style', (ctx, option: UseStyleOption
   const parent = inject(USE_STYLE_PROVIDER, null) as null | { value: UseStyleProvideData };
 
   const styleComputed = computed(() => {
+    if (ctx.isDestroyed) {return {} as UseStyleProvideData;}
+    
     const defaultData = Object.assign({ shape: applicationConfiguration.value.default.shape, size: applicationConfiguration.value.default.size, inputMode: applicationConfiguration.value.default.inputMode }, option);
 
     const { shape, size, status, inputMode } = ctx.props;