@destyler/popper 0.0.1-beta.13 → 0.0.1-beta.15

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023-PRESENT Elone Hoo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.cjs

@@ -41,20 +41,20 @@ const DestylerPopperAnchor = vue.defineComponent({
   name: "DestylerPopperAnchor",
   props: destylerPopperAnchorProps,
   setup(props) {
-    const { customElement, currentElement } = composition.useCustomElement();
+    const { forwardRef, currentElement } = composition.useForwardExpose();
     const rootContext = injectPopperRootContext();
     vue.watch(currentElement, () => {
       rootContext.onAnchorChange(props.element ?? currentElement.value);
     });
     return {
-      customElement
+      forwardRef
     };
   },
   render() {
     return vue.h(primitive.DestylerPrimitive, {
       as: this.$props.as,
       asChild: this.$props.asChild,
-      ref: "customElement"
+      ref: (el) => this.forwardRef(el)
     }, {
       default: () => this.$slots.default?.()
     });
@@ -185,8 +185,7 @@ const DestylerPopperContent = vue.defineComponent({
   props: destylerPopperContentProps,
   setup(props, { attrs }) {
     const rootContext = injectPopperRootContext();
-    const forwardRef = composition.useForwardRef();
-    const { customElement, currentElement: contentElement } = composition.useCustomElement();
+    const { forwardRef, currentElement: contentElement } = composition.useForwardExpose();
     const floatingRef = vue.ref();
     const arrow = vue.ref();
     const { width: arrowWidth, height: arrowHeight } = composition.useSize(arrow);
@@ -300,7 +299,6 @@ const DestylerPopperContent = vue.defineComponent({
       contentZIndex,
       middlewareData,
       forwardRef,
-      customElement,
       placedSide,
       placedAlign,
       attrStyle: attrs.style
@@ -321,10 +319,7 @@ const DestylerPopperContent = vue.defineComponent({
         ].join(" ")
       }
     }, vue.h(primitive.DestylerPrimitive, vue.mergeProps(this.$attrs, {
-      "ref": (vnode) => {
-        this.forwardRef(vnode);
-        this.customElement = vnode;
-      },
+      "ref": (el) => this.forwardRef(el),
       "as": this.$props.as,
       "asChild": this.$props.asChild,
       "data-side": this.placedSide,

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as vue from 'vue';
-import { PropType, Component, Ref, ComponentPublicInstance } from 'vue';
+import { PropType, Component, Ref } from 'vue';
 import { AsTag } from '@destyler/primitive';
 import { ExtractPublicPropTypes, Measurable } from '@destyler/shared';
 import * as _floating_ui_vue from '@floating-ui/vue';
@@ -37,7 +37,7 @@ declare const DestylerPopperAnchor: vue.DefineComponent<{
         readonly type: PropType<Measurable>;
     };
 }, {
-    customElement: vue.Ref<vue.ComponentPublicInstance | undefined>;
+    forwardRef: (ref: Element | vue.ComponentPublicInstance | null) => void;
 }, unknown, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.PublicProps, Readonly<vue.ExtractPropTypes<{
     readonly as: {
         readonly type: PropType<AsTag | Component>;
@@ -231,8 +231,7 @@ declare const DestylerPopperContent: vue.DefineComponent<{
     isPositioned: Readonly<Ref<boolean>>;
     contentZIndex: Ref<string>;
     middlewareData: Readonly<Ref<_floating_ui_vue.MiddlewareData>>;
-    forwardRef: (ref: any) => void;
-    customElement: Ref<ComponentPublicInstance | undefined>;
+    forwardRef: (ref: Element | vue.ComponentPublicInstance | null) => void;
     placedSide: vue.ComputedRef<"top" | "right" | "bottom" | "left">;
     placedAlign: vue.ComputedRef<"start" | "center" | "end">;
     attrStyle: any;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as vue from 'vue';
-import { PropType, Component, Ref, ComponentPublicInstance } from 'vue';
+import { PropType, Component, Ref } from 'vue';
 import { AsTag } from '@destyler/primitive';
 import { ExtractPublicPropTypes, Measurable } from '@destyler/shared';
 import * as _floating_ui_vue from '@floating-ui/vue';
@@ -37,7 +37,7 @@ declare const DestylerPopperAnchor: vue.DefineComponent<{
         readonly type: PropType<Measurable>;
     };
 }, {
-    customElement: vue.Ref<vue.ComponentPublicInstance | undefined>;
+    forwardRef: (ref: Element | vue.ComponentPublicInstance | null) => void;
 }, unknown, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.PublicProps, Readonly<vue.ExtractPropTypes<{
     readonly as: {
         readonly type: PropType<AsTag | Component>;
@@ -231,8 +231,7 @@ declare const DestylerPopperContent: vue.DefineComponent<{
     isPositioned: Readonly<Ref<boolean>>;
     contentZIndex: Ref<string>;
     middlewareData: Readonly<Ref<_floating_ui_vue.MiddlewareData>>;
-    forwardRef: (ref: any) => void;
-    customElement: Ref<ComponentPublicInstance | undefined>;
+    forwardRef: (ref: Element | vue.ComponentPublicInstance | null) => void;
     placedSide: vue.ComputedRef<"top" | "right" | "bottom" | "left">;
     placedAlign: vue.ComputedRef<"start" | "center" | "end">;
     attrStyle: any;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as vue from 'vue';
-import { PropType, Component, Ref, ComponentPublicInstance } from 'vue';
+import { PropType, Component, Ref } from 'vue';
 import { AsTag } from '@destyler/primitive';
 import { ExtractPublicPropTypes, Measurable } from '@destyler/shared';
 import * as _floating_ui_vue from '@floating-ui/vue';
@@ -37,7 +37,7 @@ declare const DestylerPopperAnchor: vue.DefineComponent<{
         readonly type: PropType<Measurable>;
     };
 }, {
-    customElement: vue.Ref<vue.ComponentPublicInstance | undefined>;
+    forwardRef: (ref: Element | vue.ComponentPublicInstance | null) => void;
 }, unknown, {}, {}, vue.ComponentOptionsMixin, vue.ComponentOptionsMixin, {}, string, vue.PublicProps, Readonly<vue.ExtractPropTypes<{
     readonly as: {
         readonly type: PropType<AsTag | Component>;
@@ -231,8 +231,7 @@ declare const DestylerPopperContent: vue.DefineComponent<{
     isPositioned: Readonly<Ref<boolean>>;
     contentZIndex: Ref<string>;
     middlewareData: Readonly<Ref<_floating_ui_vue.MiddlewareData>>;
-    forwardRef: (ref: any) => void;
-    customElement: Ref<ComponentPublicInstance | undefined>;
+    forwardRef: (ref: Element | vue.ComponentPublicInstance | null) => void;
     placedSide: vue.ComputedRef<"top" | "right" | "bottom" | "left">;
     placedAlign: vue.ComputedRef<"start" | "center" | "end">;
     attrStyle: any;

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { defineComponent, ref, watch, h, computed, watchEffect, mergeProps } from 'vue';
 import { createContext, computedEager } from '@destyler/shared';
 import { DestylerPrimitive } from '@destyler/primitive';
-import { useCustomElement, useForwardRef, useSize } from '@destyler/composition';
+import { useForwardExpose, useSize } from '@destyler/composition';
 import { offset, shift, limitShift, flip, size, arrow, hide, useFloating, autoUpdate } from '@floating-ui/vue';
 import { DestylerArrow } from '@destyler/arrow';
 
@@ -39,20 +39,20 @@ const DestylerPopperAnchor = defineComponent({
   name: "DestylerPopperAnchor",
   props: destylerPopperAnchorProps,
   setup(props) {
-    const { customElement, currentElement } = useCustomElement();
+    const { forwardRef, currentElement } = useForwardExpose();
     const rootContext = injectPopperRootContext();
     watch(currentElement, () => {
       rootContext.onAnchorChange(props.element ?? currentElement.value);
     });
     return {
-      customElement
+      forwardRef
     };
   },
   render() {
     return h(DestylerPrimitive, {
       as: this.$props.as,
       asChild: this.$props.asChild,
-      ref: "customElement"
+      ref: (el) => this.forwardRef(el)
     }, {
       default: () => this.$slots.default?.()
     });
@@ -183,8 +183,7 @@ const DestylerPopperContent = defineComponent({
   props: destylerPopperContentProps,
   setup(props, { attrs }) {
     const rootContext = injectPopperRootContext();
-    const forwardRef = useForwardRef();
-    const { customElement, currentElement: contentElement } = useCustomElement();
+    const { forwardRef, currentElement: contentElement } = useForwardExpose();
     const floatingRef = ref();
     const arrow$1 = ref();
     const { width: arrowWidth, height: arrowHeight } = useSize(arrow$1);
@@ -298,7 +297,6 @@ const DestylerPopperContent = defineComponent({
       contentZIndex,
       middlewareData,
       forwardRef,
-      customElement,
       placedSide,
       placedAlign,
       attrStyle: attrs.style
@@ -319,10 +317,7 @@ const DestylerPopperContent = defineComponent({
         ].join(" ")
       }
     }, h(DestylerPrimitive, mergeProps(this.$attrs, {
-      "ref": (vnode) => {
-        this.forwardRef(vnode);
-        this.customElement = vnode;
-      },
+      "ref": (el) => this.forwardRef(el),
       "as": this.$props.as,
       "asChild": this.$props.asChild,
       "data-side": this.placedSide,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@destyler/popper",
-  "version": "0.0.1-beta.13",
+  "version": "0.0.1-beta.15",
   "description": "unstyled popper component for vue",
   "author": "Elone Hoo <elonehoo@gmail.com>",
   "license": "MIT",
@@ -34,10 +34,10 @@
   },
   "dependencies": {
     "@floating-ui/vue": "^1.0.4",
-    "@destyler/arrow": "0.0.1-beta.13",
-    "@destyler/shared": "0.0.1-beta.13",
-    "@destyler/primitive": "0.0.1-beta.13",
-    "@destyler/composition": "0.0.1-beta.13"
+    "@destyler/composition": "0.0.1-beta.15",
+    "@destyler/shared": "0.0.1-beta.15",
+    "@destyler/arrow": "0.0.1-beta.15",
+    "@destyler/primitive": "0.0.1-beta.15"
   },
   "scripts": {
     "clear": "rimraf ./dist",