@king-design/intact 3.6.1 → 3.6.2-beta.1

package/components/dropdown/constants.ts

@@ -0,0 +1,25 @@
+import {Component} from 'intact';
+import type {DropdownItem} from './item';
+
+export interface ItemEvents {
+    onFocusin: () => void;
+    onFocusout: () => void;
+    onShowMenu: () => void;
+    onHideMenu: () => void;
+    onSelect: () => void;
+}
+
+export enum Direction {
+    Up,
+    Down
+}
+
+export type MenuKeyboardMethods = {
+    reset: () => void;
+    focus: (item: DropdownItem) => void;
+}
+
+export type ItemComponent = Component<{disabled: boolean}>
+
+export const ITEM_EVENTS = 'ItemEvents';
+export const MENU_KEYBOARD = 'MenuKeyboard';

package/components/dropdown/index.ts

@@ -41,9 +41,13 @@ export class Dropdown extends BaseDropdown<
     DropdownProps,
     DropdownEvents,
     DropdownBlocks
-> { } 
+> {
+    static readonly __isDropdown = true;
+}
 export class DropdownMenu extends BaseDropdownMenu<
     DropdownMenuProps,
     DropdownMenuEvents,
     DropdownMenuBlocks
-> { }
+> {
+    static readonly __isDropdownMenu = true;
+}

package/components/dropdown/item.ts

@@ -1,11 +1,9 @@
-import {Component, TypeDefs, inject, VNodeComponentClass} from 'intact';
+import {Component, TypeDefs, inject} from 'intact';
 import template from './item.vdt';
 import {bind} from '../utils';
-import {useItemKeyboard, MenuKeyboardMethods} from './useKeyboard';
+import {useItemKeyboard} from './useItemKeyboard';
 import {Dropdown, DROPDOWN} from './dropdown';
 import {type DropdownMenu, DROPDOWN_MENU} from './menu';
-import {IgnoreClickEvent} from '../../hooks/useDocumentClick';
-import { Dropdown as ExportDropdown, DropdownMenu as ExportDropdownMenu } from '.';
 import { useConfigContext } from '../config';
 import type { Tooltip } from '../tooltip/tooltip';
 
@@ -76,13 +74,14 @@ export class DropdownItem extends Component<DropdownItemProps, DropdownItemEvent
         let parent = this.$senior;
         while (parent) {
             // Tooltip extends Dropdown, it's also a instance of Dropdown
-            // so use constructor to detect
-            // if (parent instanceof DropdownMenu) {
-            if (parent.constructor === ExportDropdownMenu) {
+            // we should exclude this case, so use constructor to detect
+            // @modify: Check using hasOwnProperty to avoid inheritance issues and circle reference
+            const constructor = parent.constructor as any;
+            if (constructor.hasOwnProperty('__isDropdownMenu')) {
                 return; 
             }
-            if (parent.constructor === ExportDropdown) {
-                return parent;
+            if (constructor.hasOwnProperty('__isDropdown')) {
+                return parent as Dropdown;
             }
             parent = parent.$senior;
         }
@@ -122,4 +121,4 @@ function useKeyboardForDropdownItem(instance: DropdownItem) {
             instance.select();
         },
     });
-}
+}

package/components/dropdown/menu.ts

@@ -3,7 +3,7 @@ import template from './menu.vdt';
 import {bind} from '../utils';
 import {Dropdown, DROPDOWN} from './dropdown';
 import {useTransition} from './useTransition';
-import {useMenuKeyboard} from './useKeyboard';
+import {useMenuKeyboard} from './useMenuKeyboard';
 import {useMouseOutsidable} from '../../hooks/useMouseOutsidable';
 import {FeedbackCallback} from './usePosition';
 import { useConfigContext } from '../config';

package/components/dropdown/useItemKeyboard.ts

@@ -0,0 +1,38 @@
+import {useInstance, inject} from 'intact';
+import {useRecordItem} from '../../hooks/useRecordComponent';
+import {useState} from '../../hooks/useState';
+import type {DropdownItem} from './item';
+import { ItemEvents, MENU_KEYBOARD, MenuKeyboardMethods, ITEM_EVENTS } from './constants';
+
+export function useItemKeyboard(itemEvents: Omit<ItemEvents, 'onFocusin' | 'onFocusout'>) {
+    const isFocus = useState(false);
+    const keyboard = inject<MenuKeyboardMethods>(MENU_KEYBOARD)!;
+    const instance = useInstance() as DropdownItem;
+
+    useRecordItem<DropdownItem, ItemEvents>(ITEM_EVENTS, instance, {
+        ...itemEvents,
+        onFocusin() {
+            isFocus.set(true);
+        },
+        onFocusout() {
+            isFocus.set(false);
+        },
+    });
+
+    return {
+        onMouseEnter(e: MouseEvent) {
+            instance.trigger('mouseenter', e);
+            if (instance.get('disabled')) return;
+            keyboard.focus(instance);
+        },
+
+        onMouseLeave(e: MouseEvent) {
+            instance.trigger('mouseleave', e);
+            keyboard.reset();
+            // If it is a virtual item, it needs to be reset manually because the DOM is reused.
+            isFocus.set(false);
+        },
+
+        isFocus,
+    }
+}

package/components/dropdown/{useKeyboard.ts → useMenuKeyboard.ts}

@@ -5,47 +5,21 @@ import {
     useInstance,
     findDomFromVNode,
     provide,
-    inject,
     Component,
-    Children,
-    VNodeComponentClass,
     isComponentClass,
     isComponentFunction,
     hasVNodeChildren,
     hasMultipleChildren,
     VNode,
 } from 'intact';
-import {useRecordParent, useRecordItem} from '../../hooks/useRecordComponent';
+import {useRecordParent} from '../../hooks/useRecordComponent';
 import {useKeyboard} from '../../hooks/useKeyboard';
-import {useState} from '../../hooks/useState';
-import {eachChildren, isComponentVNode} from '../utils';
+import {isComponentVNode} from '../utils';
 import {DropdownItem} from './item';
 // can not import DropdownMenu from index.ts, otherwise it will cause circle reference
 // import {DropdownMenu} from './';
 import {DropdownMenu} from './menu';
-
-interface ItemEvents {
-    onFocusin: () => void;
-    onFocusout: () => void;
-    onShowMenu: () => void;
-    onHideMenu: () => void;
-    onSelect: () => void;
-}
-
-export enum Direction {
-    Up,
-    Down
-}
-
-export type MenuKeyboardMethods = {
-    reset: () => void;
-    focus: (item: DropdownItem) => void;
-}
-
-type ItemComponent = Component<{disabled: boolean}>
-
-const ITEM_EVENTS = 'ItemEvents';
-const MENU_KEYBOARD = 'MenuKeyboard';
+import { ITEM_EVENTS, ItemEvents, Direction, MenuKeyboardMethods, MENU_KEYBOARD } from './constants';
 
 export function useMenuKeyboard() {
     const items: DropdownItem[] = [];
@@ -178,39 +152,6 @@ export function useMenuKeyboard() {
     ] as const;
 }
 
-export function useItemKeyboard(itemEvents: Omit<ItemEvents, 'onFocusin' | 'onFocusout'>) {
-    const isFocus = useState(false);
-    const keyboard = inject<MenuKeyboardMethods>(MENU_KEYBOARD)!;
-    const instance = useInstance() as DropdownItem;
-
-    useRecordItem<DropdownItem, ItemEvents>(ITEM_EVENTS, instance, {
-        ...itemEvents,
-        onFocusin() {
-            isFocus.set(true);
-        },
-        onFocusout() {
-            isFocus.set(false);
-        },
-    });
-
-    return {
-        onMouseEnter(e: MouseEvent) {
-            instance.trigger('mouseenter', e);
-            if (instance.get('disabled')) return;
-            keyboard.focus(instance);
-        },
-
-        onMouseLeave(e: MouseEvent) {
-            instance.trigger('mouseleave', e);
-            keyboard.reset();
-            // If it is a virtual item, it needs to be reset manually because the DOM is reused.
-            isFocus.set(false);
-        },
-
-        isFocus,
-    }
-}
-
 function fixIndex(index: number, max: number) {
     if (index > max) {
         index = 0;

package/es/components/dropdown/constants.d.ts

@@ -0,0 +1,22 @@
+import { Component } from 'intact';
+import type { DropdownItem } from './item';
+export interface ItemEvents {
+    onFocusin: () => void;
+    onFocusout: () => void;
+    onShowMenu: () => void;
+    onHideMenu: () => void;
+    onSelect: () => void;
+}
+export declare enum Direction {
+    Up = 0,
+    Down = 1
+}
+export type MenuKeyboardMethods = {
+    reset: () => void;
+    focus: (item: DropdownItem) => void;
+};
+export type ItemComponent = Component<{
+    disabled: boolean;
+}>;
+export declare const ITEM_EVENTS = "ItemEvents";
+export declare const MENU_KEYBOARD = "MenuKeyboard";

package/es/components/dropdown/constants.js

@@ -0,0 +1,7 @@
+export var Direction;
+(function (Direction) {
+  Direction[Direction["Up"] = 0] = "Up";
+  Direction[Direction["Down"] = 1] = "Down";
+})(Direction || (Direction = {}));
+export var ITEM_EVENTS = 'ItemEvents';
+export var MENU_KEYBOARD = 'MenuKeyboard';

package/es/components/dropdown/index.d.ts

@@ -4,6 +4,8 @@ export * from './item';
 export type { Position as PositionOption, PositionShorthand } from './dropdown';
 export type { DropdownProps, DropdownEvents, DropdownBlocks, DropdownMenuProps, DropdownMenuEvents, DropdownMenuBlocks, };
 export declare class Dropdown extends BaseDropdown<DropdownProps, DropdownEvents, DropdownBlocks> {
+    static readonly __isDropdown = true;
 }
 export declare class DropdownMenu extends BaseDropdownMenu<DropdownMenuProps, DropdownMenuEvents, DropdownMenuBlocks> {
+    static readonly __isDropdownMenu = true;
 }

package/es/components/dropdown/index.js

@@ -23,10 +23,12 @@ export var Dropdown = /*#__PURE__*/function (_BaseDropdown) {
   }
   return Dropdown;
 }(BaseDropdown);
+Dropdown.__isDropdown = true;
 export var DropdownMenu = /*#__PURE__*/function (_BaseDropdownMenu) {
   _inheritsLoose(DropdownMenu, _BaseDropdownMenu);
   function DropdownMenu() {
     return _BaseDropdownMenu.apply(this, arguments) || this;
   }
   return DropdownMenu;
-}(BaseDropdownMenu);
+}(BaseDropdownMenu);
+DropdownMenu.__isDropdownMenu = true;

package/es/components/dropdown/item.d.ts

@@ -22,6 +22,6 @@ export declare class DropdownItem extends Component<DropdownItemProps, DropdownI
     private config;
     init(): void;
     select(): void;
-    hasSubMenu(): undefined;
+    hasSubMenu(): Dropdown<import("./dropdown").DropdownProps, import("./dropdown").DropdownEvents, import("./dropdown").DropdownBlocks> | undefined;
     private onClick;
 }

package/es/components/dropdown/item.js

@@ -4,10 +4,9 @@ import { __decorate } from "tslib";
 import { Component, inject } from 'intact';
 import template from './item.vdt';
 import { bind } from '../utils';
-import { useItemKeyboard } from './useKeyboard';
+import { useItemKeyboard } from './useItemKeyboard';
 import { DROPDOWN } from './dropdown';
 import { DROPDOWN_MENU } from './menu';
-import { Dropdown as ExportDropdown, DropdownMenu as ExportDropdownMenu } from '.';
 import { useConfigContext } from '../config';
 var typeDefs = {
   disabled: Boolean,
@@ -62,12 +61,13 @@ export var DropdownItem = /*#__PURE__*/function (_Component) {
     var parent = this.$senior;
     while (parent) {
       // Tooltip extends Dropdown, it's also a instance of Dropdown
-      // so use constructor to detect
-      // if (parent instanceof DropdownMenu) {
-      if (parent.constructor === ExportDropdownMenu) {
+      // we should exclude this case, so use constructor to detect
+      // @modify: Check using hasOwnProperty to avoid inheritance issues and circle reference
+      var _constructor = parent.constructor;
+      if (_constructor.hasOwnProperty('__isDropdownMenu')) {
         return;
       }
-      if (parent.constructor === ExportDropdown) {
+      if (_constructor.hasOwnProperty('__isDropdown')) {
         return parent;
       }
       parent = parent.$senior;

package/es/components/dropdown/menu.js

@@ -6,7 +6,7 @@ import template from './menu.vdt';
 import { bind } from '../utils';
 import { DROPDOWN } from './dropdown';
 import { useTransition } from './useTransition';
-import { useMenuKeyboard } from './useKeyboard';
+import { useMenuKeyboard } from './useMenuKeyboard';
 import { useMouseOutsidable } from '../../hooks/useMouseOutsidable';
 import { useConfigContext } from '../config';
 import { usePositionForDropdownMenu } from './usePosition';

package/es/components/dropdown/useItemKeyboard.d.ts

@@ -0,0 +1,6 @@
+import { ItemEvents } from './constants';
+export declare function useItemKeyboard(itemEvents: Omit<ItemEvents, 'onFocusin' | 'onFocusout'>): {
+    onMouseEnter(e: MouseEvent): void;
+    onMouseLeave(e: MouseEvent): void;
+    isFocus: import("../../hooks/useState").State<boolean>;
+};

package/es/components/dropdown/useItemKeyboard.js

@@ -0,0 +1,32 @@
+import _extends from "@babel/runtime-corejs3/helpers/extends";
+import { useInstance, inject } from 'intact';
+import { useRecordItem } from '../../hooks/useRecordComponent';
+import { useState } from '../../hooks/useState';
+import { MENU_KEYBOARD, ITEM_EVENTS } from './constants';
+export function useItemKeyboard(itemEvents) {
+  var isFocus = useState(false);
+  var keyboard = inject(MENU_KEYBOARD);
+  var instance = useInstance();
+  useRecordItem(ITEM_EVENTS, instance, _extends({}, itemEvents, {
+    onFocusin: function onFocusin() {
+      isFocus.set(true);
+    },
+    onFocusout: function onFocusout() {
+      isFocus.set(false);
+    }
+  }));
+  return {
+    onMouseEnter: function onMouseEnter(e) {
+      instance.trigger('mouseenter', e);
+      if (instance.get('disabled')) return;
+      keyboard.focus(instance);
+    },
+    onMouseLeave: function onMouseLeave(e) {
+      instance.trigger('mouseleave', e);
+      keyboard.reset();
+      // If it is a virtual item, it needs to be reset manually because the DOM is reused.
+      isFocus.set(false);
+    },
+    isFocus: isFocus
+  };
+}

package/es/components/dropdown/useMenuKeyboard.d.ts

@@ -0,0 +1,2 @@
+import { Direction } from './constants';
+export declare function useMenuKeyboard(): readonly [readonly [() => void, () => void, (v: boolean) => boolean], (index: number, direction?: Direction) => void, () => void];

package/es/components/dropdown/{useKeyboard.js → useMenuKeyboard.js}

@@ -1,20 +1,12 @@
-import _extends from "@babel/runtime-corejs3/helpers/extends";
-import { onBeforeUpdate, onMounted, onUpdated, useInstance, findDomFromVNode, provide, inject, isComponentClass, isComponentFunction, hasVNodeChildren, hasMultipleChildren } from 'intact';
-import { useRecordParent, useRecordItem } from '../../hooks/useRecordComponent';
+import { onBeforeUpdate, onMounted, onUpdated, useInstance, findDomFromVNode, provide, isComponentClass, isComponentFunction, hasVNodeChildren, hasMultipleChildren } from 'intact';
+import { useRecordParent } from '../../hooks/useRecordComponent';
 import { useKeyboard } from '../../hooks/useKeyboard';
-import { useState } from '../../hooks/useState';
 import { isComponentVNode } from '../utils';
 import { DropdownItem } from './item';
 // can not import DropdownMenu from index.ts, otherwise it will cause circle reference
 // import {DropdownMenu} from './';
 import { DropdownMenu } from './menu';
-export var Direction;
-(function (Direction) {
-  Direction[Direction["Up"] = 0] = "Up";
-  Direction[Direction["Down"] = 1] = "Down";
-})(Direction || (Direction = {}));
-var ITEM_EVENTS = 'ItemEvents';
-var MENU_KEYBOARD = 'MenuKeyboard';
+import { ITEM_EVENTS, Direction, MENU_KEYBOARD } from './constants';
 export function useMenuKeyboard() {
   var items = [];
   var itemEvents = useRecordParent(ITEM_EVENTS, true);
@@ -121,33 +113,6 @@ export function useMenuKeyboard() {
     enter: makeEventCall('onSelect')
   }), focusByIndex, reset];
 }
-export function useItemKeyboard(itemEvents) {
-  var isFocus = useState(false);
-  var keyboard = inject(MENU_KEYBOARD);
-  var instance = useInstance();
-  useRecordItem(ITEM_EVENTS, instance, _extends({}, itemEvents, {
-    onFocusin: function onFocusin() {
-      isFocus.set(true);
-    },
-    onFocusout: function onFocusout() {
-      isFocus.set(false);
-    }
-  }));
-  return {
-    onMouseEnter: function onMouseEnter(e) {
-      instance.trigger('mouseenter', e);
-      if (instance.get('disabled')) return;
-      keyboard.focus(instance);
-    },
-    onMouseLeave: function onMouseLeave(e) {
-      instance.trigger('mouseleave', e);
-      keyboard.reset();
-      // If it is a virtual item, it needs to be reset manually because the DOM is reused.
-      isFocus.set(false);
-    },
-    isFocus: isFocus
-  };
-}
 function fixIndex(index, max) {
   if (index > max) {
     index = 0;

package/es/index.d.ts

@@ -1,5 +1,5 @@
 /*!
- * @king-design v3.6.1
+ * @king-design v3.6.2-beta.1
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -66,4 +66,4 @@ export * from './components/upload';
 export * from './components/view';
 export * from './components/virtualList';
 export * from './components/wave';
-export declare const version = "3.6.1";
+export declare const version = "3.6.2-beta.1";

package/es/index.js

@@ -1,5 +1,5 @@
 /*!
- * @king-design v3.6.1
+ * @king-design v3.6.2-beta.1
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -67,5 +67,5 @@ export * from './components/upload';
 export * from './components/view';
 export * from './components/virtualList';
 export * from './components/wave';
-export var version = '3.6.1';
+export var version = '3.6.2-beta.1';
 /* generate end */

package/index.ts

@@ -1,5 +1,5 @@
 /*!
- * @king-design v3.6.1
+ * @king-design v3.6.2-beta.1
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -71,6 +71,6 @@ export * from './components/view';
 export * from './components/virtualList';
 export * from './components/wave';
 
-export const version = '3.6.1';
+export const version = '3.6.2-beta.1';
 
 /* generate end */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@king-design/intact",
-  "version": "3.6.1",
+  "version": "3.6.2-beta.1",
   "description": "A component library written in Intact for Intact, Vue, React and Angular",
   "main": "es/index.js",
   "engines": {

package/es/components/dropdown/useKeyboard.d.ts

@@ -1,23 +0,0 @@
-import { DropdownItem } from './item';
-interface ItemEvents {
-    onFocusin: () => void;
-    onFocusout: () => void;
-    onShowMenu: () => void;
-    onHideMenu: () => void;
-    onSelect: () => void;
-}
-export declare enum Direction {
-    Up = 0,
-    Down = 1
-}
-export type MenuKeyboardMethods = {
-    reset: () => void;
-    focus: (item: DropdownItem) => void;
-};
-export declare function useMenuKeyboard(): readonly [readonly [() => void, () => void, (v: boolean) => boolean], (index: number, direction?: Direction) => void, () => void];
-export declare function useItemKeyboard(itemEvents: Omit<ItemEvents, 'onFocusin' | 'onFocusout'>): {
-    onMouseEnter(e: MouseEvent): void;
-    onMouseLeave(e: MouseEvent): void;
-    isFocus: import("../../hooks/useState").State<boolean>;
-};
-export {};