naive-ui 2.30.5 → 2.30.6

package/dist/index.js

@@ -5000,44 +5000,42 @@
       },
 
       setup(props) {
-        return {
-          registered: false,
-
-          handleResize(entry) {
-            const {
-              onResize
-            } = props;
-            if (onResize !== undefined) onResize(entry);
-          }
-
-        };
-      },
+        let registered = false; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 
-      mounted() {
-        const el = this.$el;
+        const proxy = vue.getCurrentInstance().proxy;
 
-        if (el === undefined) {
-          warn('resize-observer', '$el does not exist.');
-          return;
+        function handleResize(entry) {
+          const {
+            onResize
+          } = props;
+          if (onResize !== undefined) onResize(entry);
         }
 
-        if (el.nextElementSibling !== el.nextSibling) {
-          if (el.nodeType === 3 && el.nodeValue !== '') {
-            warn('resize-observer', '$el can not be observed (it may be a text node).');
+        vue.onMounted(() => {
+          const el = proxy.$el;
+
+          if (el === undefined) {
+            warn('resize-observer', '$el does not exist.');
             return;
           }
-        }
 
-        if (el.nextElementSibling !== null) {
-          resizeObserverManager.registerHandler(el.nextElementSibling, this.handleResize);
-          this.registered = true;
-        }
-      },
+          if (el.nextElementSibling !== el.nextSibling) {
+            if (el.nodeType === 3 && el.nodeValue !== '') {
+              warn('resize-observer', '$el can not be observed (it may be a text node).');
+              return;
+            }
+          }
 
-      beforeUnmount() {
-        if (this.registered) {
-          resizeObserverManager.unregisterHandler(this.$el.nextElementSibling);
-        }
+          if (el.nextElementSibling !== null) {
+            resizeObserverManager.registerHandler(el.nextElementSibling, handleResize);
+            registered = true;
+          }
+        });
+        vue.onBeforeUnmount(() => {
+          if (registered) {
+            resizeObserverManager.unregisterHandler(proxy.$el.nextElementSibling);
+          }
+        });
       },
 
       render() {
@@ -46498,7 +46496,7 @@
     }
     function normalizeAlphaUnit(value) {
       if (/^\d{1,3}\.?\d*%$/.test(value.trim())) {
-        return Math.max(0, Math.min(parseInt(value), 100));
+        return Math.max(0, Math.min(parseInt(value) / 100, 100));
       }
       return false;
     }
@@ -58240,6 +58238,10 @@
     var Cell = vue.defineComponent({
       name: "DataTableCell",
       props: {
+        clsPrefix: {
+          type: String,
+          required: true
+        },
         row: {
           type: Object,
           required: true
@@ -58272,13 +58274,19 @@
             cell = renderCell ? renderCell(lodash.exports.get(row, key), row, column) : lodash.exports.get(row, key);
           }
         }
-        if (ellipsis && typeof ellipsis === "object") {
-          const { mergedTheme } = this;
-          return /* @__PURE__ */ vue.h(NEllipsis, {
-            ...ellipsis,
-            theme: mergedTheme.peers.Ellipsis,
-            themeOverrides: mergedTheme.peerOverrides.Ellipsis
-          }, { default: () => cell });
+        if (ellipsis) {
+          if (typeof ellipsis === "object") {
+            const { mergedTheme } = this;
+            return /* @__PURE__ */ vue.h(NEllipsis, {
+              ...ellipsis,
+              theme: mergedTheme.peers.Ellipsis,
+              themeOverrides: mergedTheme.peerOverrides.Ellipsis
+            }, { default: () => cell });
+          } else {
+            return /* @__PURE__ */ vue.h("span", {
+              class: `${this.clsPrefix}-data-table-td__ellipsis`
+            }, cell);
+          }
         }
         return cell;
       }
@@ -58894,7 +58902,7 @@
                   }
                 }
                 const hoverKey = isCrossRowTd ? this.hoverKey : null;
-                const { ellipsis, cellProps } = column;
+                const { cellProps } = column;
                 const resolvedCellProps = cellProps?.(rowData, rowIndex);
                 return /* @__PURE__ */ vue.h("td", {
                   ...resolvedCellProps,
@@ -58919,7 +58927,6 @@
                     column.fixed && `${mergedClsPrefix}-data-table-td--fixed-${column.fixed}`,
                     column.align && `${mergedClsPrefix}-data-table-td--${column.align}-align`,
                     {
-                      [`${mergedClsPrefix}-data-table-td--ellipsis`]: ellipsis === true || ellipsis && !ellipsis.tooltip,
                       [`${mergedClsPrefix}-data-table-td--selection`]: column.type === "selection",
                       [`${mergedClsPrefix}-data-table-td--expand`]: column.type === "expand",
                       [`${mergedClsPrefix}-data-table-td--last-col`]: isLastCol,
@@ -58952,6 +58959,7 @@
                   expanded,
                   onClick: () => handleUpdateExpanded(rowKey, null)
                 }) : null : null : /* @__PURE__ */ vue.h(Cell, {
+                  clsPrefix: mergedClsPrefix,
                   index: rowIndex,
                   row: rowData,
                   column,
@@ -60409,20 +60417,25 @@
         background-color .3s var(--n-bezier),
         border-color .3s var(--n-bezier),
         color .3s var(--n-bezier);
-    `, [cM("last-row", {
+    `, [cM("expand", [cB("data-table-expand-trigger", `
+          margin-right: 0;
+        `)]), cM("last-row", {
       borderBottom: "0 solid var(--n-merged-border-color)"
     }, [c$1("&::after", {
       bottom: "0 !important"
     }), c$1("&::before", {
       bottom: "0 !important"
     })]), cM("summary", `
-      background-color: var(--n-merged-th-color);
-    `), cM("hover", {
+        background-color: var(--n-merged-th-color);
+      `), cM("hover", {
       backgroundColor: "var(--n-merged-td-color-hover)"
-    }), cM("ellipsis", `
+    }), cE("ellipsis", `
+        display: inline-block;
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
+        max-width: 100%;
+        vertical-align: bottom;
       `), cM("selection, expand", `
         text-align: center;
         padding: 0;
@@ -71644,10 +71657,8 @@
         },
         blockScroll: Boolean,
         ...presetProps,
-        onClickoutside: {
-          type: Function,
-          required: true
-        },
+        renderMask: Function,
+        onClickoutside: Function,
         onBeforeLeave: {
           type: Function,
           required: true
@@ -71744,9 +71755,6 @@
         function handlePositiveClick() {
           props.onPositiveClick();
         }
-        function handleClickOutside(e) {
-          props.onClickoutside(e);
-        }
         const childNodeRef = vue.ref(null);
         vue.watch(childNodeRef, (node) => {
           if (node) {
@@ -71770,7 +71778,6 @@
           scrollbarRef,
           displayed: displayedRef,
           childNodeRef,
-          handleClickOutside,
           handlePositiveClick,
           handleNegativeClick,
           handleCloseClick,
@@ -71786,7 +71793,6 @@
           handleEnter,
           handleAfterLeave,
           handleBeforeLeave,
-          handleClickOutside,
           preset,
           mergedClsPrefix
         } = this;
@@ -71811,54 +71817,63 @@
           themeOverrides: this.mergedTheme.peerOverrides.Scrollbar,
           contentClass: `${mergedClsPrefix}-modal-scroll-content`
         }, {
-          default: () => /* @__PURE__ */ vue.h(FocusTrap, {
-            disabled: !this.trapFocus,
-            active: this.show,
-            onEsc: this.onEsc,
-            autoFocus: this.autoFocus
-          }, {
-            default: () => /* @__PURE__ */ vue.h(vue.Transition, {
-              name: "fade-in-scale-up-transition",
-              appear: this.appear ?? this.isMounted,
-              onEnter: handleEnter,
-              onAfterEnter: this.onAfterEnter,
-              onAfterLeave: handleAfterLeave,
-              onBeforeLeave: handleBeforeLeave
+          default: () => [
+            this.renderMask?.(),
+            /* @__PURE__ */ vue.h(FocusTrap, {
+              disabled: !this.trapFocus,
+              active: this.show,
+              onEsc: this.onEsc,
+              autoFocus: this.autoFocus
             }, {
-              default: () => vue.withDirectives(this.preset === "confirm" || this.preset === "dialog" ? /* @__PURE__ */ vue.h(NDialog, {
-                ...this.$attrs,
-                class: [
-                  `${mergedClsPrefix}-modal`,
-                  this.$attrs.class
-                ],
-                ref: "bodyRef",
-                theme: this.mergedTheme.peers.Dialog,
-                themeOverrides: this.mergedTheme.peerOverrides.Dialog,
-                ...keep(this.$props, dialogPropKeys),
-                "aria-modal": "true"
-              }, $slots) : this.preset === "card" ? /* @__PURE__ */ vue.h(NCard, {
-                ...this.$attrs,
-                ref: "bodyRef",
-                class: [
-                  `${mergedClsPrefix}-modal`,
-                  this.$attrs.class
-                ],
-                theme: this.mergedTheme.peers.Card,
-                themeOverrides: this.mergedTheme.peerOverrides.Card,
-                ...keep(this.$props, cardBasePropKeys),
-                "aria-modal": "true",
-                role: "dialog"
-              }, $slots) : this.childNodeRef = childNode, [
-                [vue.vShow, this.show],
-                [
-                  clickoutside,
-                  handleClickOutside,
-                  void 0,
-                  { capture: true }
-                ]
-              ])
+              default: () => /* @__PURE__ */ vue.h(vue.Transition, {
+                name: "fade-in-scale-up-transition",
+                appear: this.appear ?? this.isMounted,
+                onEnter: handleEnter,
+                onAfterEnter: this.onAfterEnter,
+                onAfterLeave: handleAfterLeave,
+                onBeforeLeave: handleBeforeLeave
+              }, {
+                default: () => {
+                  const dirs = [
+                    [vue.vShow, this.show]
+                  ];
+                  const { onClickoutside } = this;
+                  if (onClickoutside) {
+                    dirs.push([
+                      clickoutside,
+                      this.onClickoutside,
+                      void 0,
+                      { capture: true }
+                    ]);
+                  }
+                  return vue.withDirectives(this.preset === "confirm" || this.preset === "dialog" ? /* @__PURE__ */ vue.h(NDialog, {
+                    ...this.$attrs,
+                    class: [
+                      `${mergedClsPrefix}-modal`,
+                      this.$attrs.class
+                    ],
+                    ref: "bodyRef",
+                    theme: this.mergedTheme.peers.Dialog,
+                    themeOverrides: this.mergedTheme.peerOverrides.Dialog,
+                    ...keep(this.$props, dialogPropKeys),
+                    "aria-modal": "true"
+                  }, $slots) : this.preset === "card" ? /* @__PURE__ */ vue.h(NCard, {
+                    ...this.$attrs,
+                    ref: "bodyRef",
+                    class: [
+                      `${mergedClsPrefix}-modal`,
+                      this.$attrs.class
+                    ],
+                    theme: this.mergedTheme.peers.Card,
+                    themeOverrides: this.mergedTheme.peerOverrides.Card,
+                    ...keep(this.$props, cardBasePropKeys),
+                    "aria-modal": "true",
+                    role: "dialog"
+                  }, $slots) : this.childNodeRef = childNode, dirs);
+                }
+              })
             })
-          })
+          ]
         })), [
           [
             vue.vShow,
@@ -72129,6 +72144,7 @@
         }, {
           default: () => {
             this.onRender?.();
+            const { unstableShowMask } = this;
             return vue.withDirectives(/* @__PURE__ */ vue.h("div", {
               role: "none",
               ref: "containerRef",
@@ -72138,19 +72154,7 @@
                 this.namespace
               ],
               style: this.cssVars
-            }, this.unstableShowMask ? /* @__PURE__ */ vue.h(vue.Transition, {
-              name: "fade-in-transition",
-              key: "mask",
-              appear: this.internalAppear ?? this.isMounted
-            }, {
-              default: () => {
-                return this.show ? /* @__PURE__ */ vue.h("div", {
-                  "aria-hidden": true,
-                  ref: "containerRef",
-                  class: `${mergedClsPrefix}-modal-mask`
-                }) : null;
-              }
-            }) : null, /* @__PURE__ */ vue.h(NModalBodyWrapper, {
+            }, /* @__PURE__ */ vue.h(NModalBodyWrapper, {
               style: this.overlayStyle,
               ...this.$attrs,
               ref: "bodyWrapper",
@@ -72168,7 +72172,21 @@
               onBeforeLeave: this.handleBeforeLeave,
               onAfterEnter: this.onAfterEnter,
               onAfterLeave: this.handleAfterLeave,
-              onClickoutside: this.handleClickoutside
+              onClickoutside: unstableShowMask ? void 0 : this.handleClickoutside,
+              renderMask: unstableShowMask ? () => /* @__PURE__ */ vue.h(vue.Transition, {
+                name: "fade-in-transition",
+                key: "mask",
+                appear: this.internalAppear ?? this.isMounted
+              }, {
+                default: () => {
+                  return this.show ? /* @__PURE__ */ vue.h("div", {
+                    "aria-hidden": true,
+                    ref: "containerRef",
+                    class: `${mergedClsPrefix}-modal-mask`,
+                    onClick: this.handleClickoutside
+                  }) : null;
+                }
+              }) : void 0
             }, this.$slots)), [
               [
                 zindexable,
@@ -76566,6 +76584,7 @@
       props: gridItemProps,
       setup() {
         const {
+          isSsrRef,
           xGapRef,
           itemStyleRef,
           overflowRef
@@ -76575,6 +76594,7 @@
           overflow: overflowRef,
           itemStyle: itemStyleRef,
           deriveStyle: () => {
+            void isSsrRef.value;
             const {
               privateSpan = defaultSpan,
               privateShow = true,
@@ -77164,6 +77184,7 @@
     };
 
     const defaultCols = 24;
+    const SSR_ATTR_NAME = "__ssr__";
     const gridProps = {
       responsive: {
         type: [String, Boolean],
@@ -77232,12 +77253,26 @@
           }
           return void 0;
         });
+        const isSsrRef = vue.ref(false);
+        const contentElRef = vue.ref();
+        vue.onMounted(() => {
+          const { value: contentEl } = contentElRef;
+          if (contentEl) {
+            if (contentEl.hasAttribute(SSR_ATTR_NAME)) {
+              contentEl.removeAttribute(SSR_ATTR_NAME);
+              isSsrRef.value = true;
+            }
+          }
+        });
         vue.provide(gridInjectionKey, {
+          isSsrRef,
           itemStyleRef: vue.toRef(props, "itemStyle"),
           xGapRef: responsiveXGapRef,
           overflowRef
         });
         return {
+          isSsr: !isBrowser$2,
+          contentEl: contentElRef,
           mergedClsPrefix: mergedClsPrefixRef,
           style: vue.computed(() => {
             return {
@@ -77341,8 +77376,10 @@
             }
           }
           return vue.h("div", vue.mergeProps({
+            ref: "contentEl",
             class: `${this.mergedClsPrefix}-grid`,
-            style: this.style
+            style: this.style,
+            [SSR_ATTR_NAME]: this.isSsr || void 0
           }, this.$attrs), childrenAndRawSpan.map(({ child }) => child));
         };
         return this.isResponsive && this.responsive === "self" ? /* @__PURE__ */ vue.h(VResizeObserver, {
@@ -80133,6 +80170,8 @@
           shouldStartLoading: shouldStartLoadingRef,
           loaded: loadedRef,
           mergedOnError: (e) => {
+            if (!shouldStartLoadingRef.value)
+              return;
             showErrorRef.value = true;
             const { onError, imgProps: { onError: imgPropsOnError } = {} } = props;
             onError?.(e);
@@ -96608,7 +96647,7 @@
         createDiscreteApi: createDiscreteApi
     });
 
-    var version = "2.30.5";
+    var version = "2.30.6";
 
     function create() {
       let {