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

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,10 +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} from './useItemKeyboard';
 import {Dropdown, DROPDOWN} from './dropdown';
 import {type DropdownMenu, DROPDOWN_MENU} from './menu';
-import { Dropdown as ExportDropdown, DropdownMenu as ExportDropdownMenu } from '.';
 import { useConfigContext } from '../config';
 import type { Tooltip } from '../tooltip/tooltip';
 
@@ -75,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;
         }
@@ -121,4 +121,4 @@ function useKeyboardForDropdownItem(instance: DropdownItem) {
             instance.select();
         },
     });
-}
+}

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

@@ -7,7 +7,6 @@ import { bind } from '../utils';
 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/index.d.ts

@@ -1,5 +1,5 @@
 /*!
- * @king-design v3.6.2-beta.0
+ * @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.2-beta.0";
+export declare const version = "3.6.2-beta.1";

package/es/index.js

@@ -1,5 +1,5 @@
 /*!
- * @king-design v3.6.2-beta.0
+ * @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.2-beta.0';
+export var version = '3.6.2-beta.1';
 /* generate end */

package/index.ts

@@ -1,5 +1,5 @@
 /*!
- * @king-design v3.6.2-beta.0
+ * @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.2-beta.0';
+export const version = '3.6.2-beta.1';
 
 /* generate end */

package/package.json

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