@gingkoo/pandora-explorer 0.0.1-alpha.52 → 0.0.1-alpha.54

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-explorer v0.0.1-alpha.52
+ * @gingkoo/pandora-explorer v0.0.1-alpha.54
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import cx$1 from 'classnames';
@@ -1538,7 +1538,6 @@ function Dropdown(props) {
     },
     onClick: e => {
       if (trigger == 'click') {
-        e.stopPropagation();
         let x = 0;
         let y = 0;
         x = e.nativeEvent.clientX + 5;
@@ -5305,12 +5304,12 @@ function TableItem(props) {
                     onRename?.(e.target?.value);
                     return;
                   }
-                  if (e.target?.value === param[v?.key]) {
-                    onRename?.(false);
-                    return;
-                  }
                   onRename?.(e.target?.value);
                 }
+                if (e.key === 'Escape') {
+                  onRename?.(false);
+                  return;
+                }
               },
               onFocus: e => {
                 let i = param[v?.key]?.lastIndexOf('.');
@@ -5385,6 +5384,9 @@ var TreeItem = (props => {
     menudata = getMenu('');
   }
   return jsx("div", {
+    style: {
+      height: '100%'
+    },
     onContextMenu: e => {
       e.preventDefault();
       let x = 0;
@@ -5417,6 +5419,9 @@ var TreeItem = (props => {
           if (e.key === 'Enter' || e.keyCode === 13) {
             onRename?.(title);
           }
+          if (e.key === 'Escape') {
+            onRename?.(false);
+          }
         },
         onFocus: e => {
           let i = title.lastIndexOf('.');
@@ -5435,30 +5440,35 @@ var TreeItem = (props => {
       })
     }) : jsxs("div", {
       className: 'explorer-tree-node',
-      onClick: () => {},
       children: [jsx("div", {
         className: 'node-title',
         children: title || ''
       }), jsx("div", {
         className: 'node-menu',
-        children: props?.menu !== false && jsx(Dropdown, {
-          trigger: 'click',
-          placement: 'right',
-          dropdownRender: ({
-            onClone
-          }) => {
-            return jsx(Menu, {
-              menu: menudata,
-              onChange: v => {
-                onClone && onClone();
-                onMenuClick && onMenuClick(v);
-              }
+        children: props?.menu !== false && jsx("div", {
+          className: 'node-menu-icon',
+          onClick: e => {
+            e.stopPropagation();
+            let x = 0;
+            let y = 0;
+            x = e.nativeEvent.clientX + 5;
+            y = e.nativeEvent.clientY + 5;
+            props?.openMenu({
+              x,
+              y,
+              content: jsx(Menu, {
+                menu: menudata,
+                loadMenu: loadMenu,
+                onChange: async v => {
+                  onMenuClick && onMenuClick(v);
+                  props?.closeMenu?.();
+                }
+              })
+            }, {
+              key: props.id
             });
           },
-          children: jsx("div", {
-            className: 'node-menu-icon',
-            children: jsx(CaretRight, {})
-          })
+          children: jsx(CaretRight, {})
         })
       })]
     })
@@ -7684,9 +7694,9 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     };
   }, []);
   useLayoutEffect(() => {
-    document.addEventListener('keydown', handleKeyDown);
+    window.addEventListener('keydown', handleKeyDown);
     return () => {
-      document.removeEventListener('keydown', handleKeyDown);
+      window.removeEventListener('keydown', handleKeyDown);
     };
   }, [curSelect, dataMap]);
   const handleKeyDown = e => {
@@ -7699,17 +7709,17 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     if (e.altKey && e.key === '1') {
       setMenutype('tile');
     }
-    if (e.altKey && e.key === 'c') {
+    if ((e.ctrlKey || e.metaKey) && e.key === 'c') {
       if (curSelect && dataMap?.[curSelect]) {
         onCopy?.(dataMap?.[curSelect]);
       }
     }
-    if (e.altKey && e.key === 'x') {
+    if ((e.ctrlKey || e.metaKey) && e.key === 'x') {
       if (curSelect && dataMap?.[curSelect]) {
         onCopy?.(dataMap?.[curSelect]);
       }
     }
-    if (e.altKey && e.key === 'v') {
+    if ((e.ctrlKey || e.metaKey) && e.key === 'v') {
       if (curSelect && dataMap?.[curSelect]) {
         onCopy?.(dataMap?.[curSelect]);
       }
@@ -7808,7 +7818,6 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     return data?.fileList || [];
   }
   const reloadNode = key => {
-    setNavLoadKey(nav_loadKey.filter(v => v !== key));
     const addData = (data, key) => {
       let arr = data;
       let i = 0;
@@ -7828,6 +7837,9 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     };
     let arr = addData(data || [], key);
     onChange?.(arr);
+    setTimeout(() => {
+      setNavLoadKey(nav_loadKey.filter(v => v !== key));
+    }, 100);
   };
   function updata(id, param) {
     const fixData = (data, id, param) => {
@@ -7855,6 +7867,27 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
   //创建和重名
   async function onRename(key, value, info, type) {
     if (info.create_file) {
+      const delata = data => {
+        let arr = data;
+        let filter = [];
+        let i = 0;
+        while (i < arr.length) {
+          let item = arr[i];
+          if (!item?.create_file) {
+            filter.push(item);
+          }
+          if (Array.isArray(item.children)) {
+            item.children = delata(item.children);
+          }
+          i++;
+        }
+        return filter || [];
+      };
+      if (value === false) {
+        let arr = delata(curlist);
+        setCurList(arr);
+        return;
+      }
       if (curInfo) {
         await createFile?.(value, curInfo);
         curInfo?.key && loadData(curInfo?.key);
@@ -7963,9 +7996,7 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
   async function onMenuClick(key, param, type) {
     if (key == 'remove') {
       await onDelect?.(param);
-      if (param.key === curInfo?.key) {
-        data && loadData(data[0].key);
-      }
+      data && loadData(data[0].key);
       if (type == 'menu') {
         reloadNode(param.parentPath);
       }
@@ -7981,6 +8012,7 @@ const Explorer = /*#__PURE__*/forwardRef((props, ref) => {
     }
     if (key == 'paste') {
       onPaste?.(param);
+      curInfo?.key && loadData(curInfo.key);
       reloadNode(param.key);
       return;
     }