@ioca/react 1.5.24 → 1.5.26

package/lib/es/components/popup/popup.js

@@ -459,7 +459,11 @@ function Popup(props) {
         if (!triggerEl || !contentEl)
             return;
         const tar = e.target;
-        if (triggerEl.contains(tar) || contentEl.contains(tar))
+        if (contentEl.contains(tar))
+            return;
+        if (triggerEl.contains(tar) && latestRef.current.trigger !== "contextmenu")
+            return;
+        if (triggerEl.contains(tar) && e.button !== 0)
             return;
         doHide();
     };

package/lib/es/components/tabs/tabs.js

@@ -9,7 +9,7 @@ import Item from './item.js';
 import TabsNavs from './navs.js';
 
 const Tabs = ((props) => {
-    const { ref, active, tabs: items, type = "default", prepend, append, children, className, vertical, toggable, loader, navsJustify = "start", navsClass, bar = true, hideMore, barClass, renderMore = defaultRenderMore, onTabChange, ...rest } = props;
+    const { ref, active, tabs: items, type = "default", prepend, append, children, className, vertical, toggable, loader, navsJustify = "start", navsClass, bar = true, hideMore, barClass, renderMore = defaultRenderMore, onTabChange, onClose, ...rest } = props;
     const navRefs = useRef([]);
     const navsRef = useRef(null);
     const contentsRef = useRef(new Map());
@@ -84,6 +84,7 @@ const Tabs = ((props) => {
         const i = currentTabs.findIndex((t) => t.key === key);
         if (i < 0)
             return;
+        onClose?.(key);
         if (sourceKeysRef.current.has(key)) {
             hiddenSourceKeysRef.current.add(key);
         }

package/lib/index.js

@@ -2305,7 +2305,11 @@ function Popup(props) {
         if (!triggerEl || !contentEl)
             return;
         const tar = e.target;
-        if (triggerEl.contains(tar) || contentEl.contains(tar))
+        if (contentEl.contains(tar))
+            return;
+        if (triggerEl.contains(tar) && latestRef.current.trigger !== "contextmenu")
+            return;
+        if (triggerEl.contains(tar) && e.button !== 0)
             return;
         doHide();
     };
@@ -6084,7 +6088,7 @@ const TabsNavs = (props) => {
 var TabsNavs$1 = memo(TabsNavs);
 
 const Tabs = ((props) => {
-    const { ref, active, tabs: items, type = "default", prepend, append, children, className, vertical, toggable, loader, navsJustify = "start", navsClass, bar = true, hideMore, barClass, renderMore = defaultRenderMore, onTabChange, ...rest } = props;
+    const { ref, active, tabs: items, type = "default", prepend, append, children, className, vertical, toggable, loader, navsJustify = "start", navsClass, bar = true, hideMore, barClass, renderMore = defaultRenderMore, onTabChange, onClose, ...rest } = props;
     const navRefs = useRef([]);
     const navsRef = useRef(null);
     const contentsRef = useRef(new Map());
@@ -6159,6 +6163,7 @@ const Tabs = ((props) => {
         const i = currentTabs.findIndex((t) => t.key === key);
         if (i < 0)
             return;
+        onClose?.(key);
         if (sourceKeysRef.current.has(key)) {
             hiddenSourceKeysRef.current.add(key);
         }

package/lib/types/components/tabs/type.d.ts

@@ -32,6 +32,7 @@ interface ITabs {
     renderMore?: (moreTabs: ITabItem[]) => ReactNode;
     loader?: ReactNode;
     onTabChange?: (to?: string, from?: string) => void;
+    onClose?: (key: string) => void;
 }
 interface RefTabs {
     open: (key: string) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ioca/react",
-    "version": "1.5.24",
+    "version": "1.5.26",
     "type": "module",
     "scripts": {
         "dev": "vite",