feat(permission-share): support permission share (#2416)

* feat(debounce): support cancel * chore(protocol): update to 1.36 * fix(react): the update could not be triggered * fix(part-service): the update is triggered when uninstalled
dream-num · Jun 4, 2024 · 0332000 · 0332000
1 parent 8657cc4
commit 0332000
Show file tree

Hide file tree

Showing 17 changed files with 108 additions and 189 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -67,7 +67,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/protocol": "^0.1.35",
+        "@univerjs/protocol": "^0.1.36",
         "nanoid": "5.0.7",
         "numeral": "^2.0.6",
         "ot-json1": "^1.0.2"

diff --git a/packages/core/src/shared/debounce.ts b/packages/core/src/shared/debounce.ts
@@ -16,10 +16,16 @@
 
 type debounceFn<T extends (...args: any[]) => any> = (this: ThisParameterType<T>, ...args: Parameters<T>) => void;
 
-export function debounce<T extends (...args: any[]) => any>(func: T, wait: number): debounceFn<T> {
+/**
+ * Creates a debounced function that delays invoking the provided function until after `wait` milliseconds have elapsed since the last time the debounced function was invoked.
+ * @template T - The type of the function to be debounced.
+ * @param {T} func - The function to be debounced.
+ * @param {number} wait - The number of milliseconds to wait before invoking the function.
+ * @returns {debounceFn<T> & { cancel: () => void }} - The debounced function, which also has a `cancel` method to cancel the scheduled function call.
+ */
+export function debounce<T extends (...args: any[]) => any>(func: T, wait: number) {
     let timeout: NodeJS.Timeout | null;
-
-    return function (this: ThisParameterType<T>, ...args: Parameters<T>) {
+    function run(this: ThisParameterType<T>, ...args: Parameters<T>) {
         const context = this;
 
         const later = function () {
@@ -29,5 +35,13 @@ export function debounce<T extends (...args: any[]) => any>(func: T, wait: numbe
 
         clearTimeout(timeout as NodeJS.Timeout);
         timeout = setTimeout(later, wait);
-    };
+    }
+    Object.defineProperty(run, 'cancel', {
+        value: () => {
+            clearTimeout(timeout as NodeJS.Timeout);
+        },
+        enumerable: false,
+        writable: false,
+    });
+    return run as debounceFn<T> & { cancel: () => void };
 }
diff --git a/packages/data-validation/package.json b/packages/data-validation/package.json
@@ -68,7 +68,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/protocol": "^0.1.35"
+        "@univerjs/protocol": "^0.1.36"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",

diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
@@ -84,7 +84,7 @@
     },
     "dependencies": {
         "@univerjs/icons": "^0.1.56",
-        "@univerjs/protocol": "^0.1.35",
+        "@univerjs/protocol": "^0.1.36",
         "@univerjs/sheets-conditional-formatting": "workspace:*",
         "lodash.get": "^4.4.2",
         "lodash.set": "^4.3.2",

diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json
@@ -73,7 +73,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/protocol": "^0.1.35"
+        "@univerjs/protocol": "^0.1.36"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",

diff --git a/packages/sheets-data-validation/package.json b/packages/sheets-data-validation/package.json
@@ -78,7 +78,7 @@
     },
     "dependencies": {
         "@univerjs/icons": "^0.1.56",
-        "@univerjs/protocol": "^0.1.35"
+        "@univerjs/protocol": "^0.1.36"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",

diff --git a/packages/sheets-find-replace/package.json b/packages/sheets-find-replace/package.json
@@ -74,7 +74,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/protocol": "0.1.34"
+        "@univerjs/protocol": "0.1.36"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",

diff --git a/packages/sheets-hyper-link/package.json b/packages/sheets-hyper-link/package.json
@@ -64,7 +64,7 @@
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",
-        "@univerjs/protocol": "^0.1.35",
+        "@univerjs/protocol": "^0.1.36",
         "@univerjs/shared": "workspace:*",
         "@univerjs/sheets": "workspace:*",
         "@wendellhu/redi": "^0.15.2",

diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
@@ -84,7 +84,7 @@
     },
     "dependencies": {
         "@univerjs/icons": "^0.1.56",
-        "@univerjs/protocol": "^0.1.35"
+        "@univerjs/protocol": "^0.1.36"
     },
     "devDependencies": {
         "@types/react": "^18.3.3",

diff --git a/packages/sheets/package.json b/packages/sheets/package.json
@@ -73,7 +73,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/protocol": "^0.1.35"
+        "@univerjs/protocol": "^0.1.36"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",

diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
@@ -74,7 +74,7 @@
     },
     "dependencies": {
         "@univerjs/icons": "^0.1.56",
-        "@univerjs/protocol": "^0.1.35",
+        "@univerjs/protocol": "^0.1.36",
         "@univerjs/thread-comment": "workspace:*"
     },
     "devDependencies": {

diff --git a/packages/thread-comment/package.json b/packages/thread-comment/package.json
@@ -65,7 +65,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/protocol": "^0.1.35"
+        "@univerjs/protocol": "^0.1.36"
     },
     "devDependencies": {
         "@univerjs/core": "workspace:*",

diff --git a/packages/ui/src/services/parts/parts.service.ts b/packages/ui/src/services/parts/parts.service.ts
@@ -67,6 +67,7 @@ export class UIPartsService extends Disposable implements IUIPartsService {
             if (components.size === 0) {
                 this._componentsByPart.delete(part);
             }
+            this._componentRegistered$.next(part);
         });
     }
 

diff --git a/packages/ui/src/views/App.tsx b/packages/ui/src/views/App.tsx
@@ -52,11 +52,11 @@ export function App(props: IUniverAppProps) {
 
     const uiPartsService = useDependency(IUIPartsService);
 
-    const [updateTrigger, setUpdateTrigger] = useState(false);
+    const [updateTrigger, setUpdateTrigger] = useState({});
 
     useEffect(() => {
         const updateSubscription = uiPartsService.componentRegistered$.subscribe(() => {
-            setUpdateTrigger((prev) => !prev);
+            setUpdateTrigger({});
         });
 
         return () => {

diff --git a/packages/umd/package.json b/packages/umd/package.json
@@ -56,7 +56,7 @@
         "@univerjs/facade": "workspace:*",
         "@univerjs/find-replace": "workspace:*",
         "@univerjs/network": "workspace:*",
-        "@univerjs/protocol": "^0.1.35",
+        "@univerjs/protocol": "^0.1.36",
         "@univerjs/rpc": "workspace:*",
         "@univerjs/sheets": "workspace:*",
         "@univerjs/sheets-conditional-formatting": "workspace:*",

diff --git a/packages/uniscript/package.json b/packages/uniscript/package.json
@@ -80,7 +80,7 @@
         "rxjs": ">=7.0.0"
     },
     "dependencies": {
-        "@univerjs/protocol": "^0.1.35",
+        "@univerjs/protocol": "^0.1.36",
         "@univerjs/sheets": "workspace:*"
     },
     "devDependencies": {
-Original file line number
+Diff line change
@@ Expand Up @@
                 if (components.size === 0) {
                     this._componentsByPart.delete(part);
                 }
+                this._componentRegistered$.next(part);
             });
         }
@@ Expand Down @@