fix(float-button): error when using with popover, closes #5933

tusen-ai · May 13, 2024 · 5b8bfae · 5b8bfae
1 parent a6d4b11
commit 5b8bfae
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## NEXT_VERSION
+
+### Fixes
+
+- Fix `n-float-button` error when using with `popover` component, closes [#5933](https://github.com/tusen-ai/naive-ui/issues/5933).
+
 ## 2.38.2
 
 `2024-05-03`

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## NEXT_VERSION
+
+### Fixes
+
+- 修复 `n-float-button` 和 `popover` 一起使用会报错, 关闭 [#5933](https://github.com/tusen-ai/naive-ui/issues/5933)
+
 ## 2.38.2
 
 `2024-05-03`

diff --git a/src/float-button/src/FloatButton.tsx b/src/float-button/src/FloatButton.tsx
@@ -211,7 +211,7 @@ export default defineComponent({
     } = this
     const dirs: DirectiveArguments = [[mousemoveoutside, this.handleMouseleave]]
     onRender?.()
-    return withDirectives(
+    return (
       <div
         class={[
           `${mergedClsPrefix}-float-button`,
@@ -227,19 +227,22 @@ export default defineComponent({
         role="button"
       >
         <div class={`${mergedClsPrefix}-float-button__fill`} aria-hidden></div>
-        <div class={`${mergedClsPrefix}-float-button__body`}>
-          {$slots.default?.()}
-          {resolveWrappedSlot($slots.description, (children) => {
-            if (children) {
-              return (
-                <div class={`${mergedClsPrefix}-float-button__description`}>
-                  {children}
-                </div>
-              )
-            }
-            return null
-          })}
-        </div>
+        {withDirectives(
+          <div class={`${mergedClsPrefix}-float-button__body`}>
+            {$slots.default?.()}
+            {resolveWrappedSlot($slots.description, (children) => {
+              if (children) {
+                return (
+                  <div class={`${mergedClsPrefix}-float-button__description`}>
+                    {children}
+                  </div>
+                )
+              }
+              return null
+            })}
+          </div>,
+          dirs
+        )}
         {menuTrigger ? (
           <div class={`${mergedClsPrefix}-float-button__close`}>
             <NBaseIcon clsPrefix={mergedClsPrefix}>
@@ -258,8 +261,7 @@ export default defineComponent({
             {resolveSlot($slots.menu, () => [])}
           </div>
         ) : null}
-      </div>,
-      dirs
+      </div>
     )
   }
 })