@opentiny/vue-renderless 3.10.5 → 3.10.7

package/common/deps/popper.js

@@ -21,6 +21,7 @@ const DEFAULTS = {
   modifiers,
   modifiersIgnored: []
 };
+const getRealWindow = () => window.tinyGetRealWindow ? window.tinyGetRealWindow() : window;
 const getRealElement = (el) => el.jquery ? el[0] : el;
 const setStyle = (el, styles) => {
   const isNumeric = (n) => n !== "" && !isNaN(parseFloat(n)) && isFinite(n);
@@ -109,14 +110,17 @@ const getScrollParent = (el) => {
 };
 const getOffsetRectRelativeToCustomParent = (el, parent, fixed) => {
   let { top, left, width, height } = getBoundingClientRect(el);
-  let parentRect = getBoundingClientRect(parent);
   if (fixed) {
-    let { scrollTop, scrollLeft } = getScrollParent(parent);
-    parentRect.top += scrollTop;
-    parentRect.bottom += scrollTop;
-    parentRect.left += scrollLeft;
-    parentRect.right += scrollLeft;
+    return {
+      top,
+      left,
+      bottom: top + height,
+      right: left + width,
+      width,
+      height
+    };
   }
+  let parentRect = getBoundingClientRect(parent);
   let rect = {
     top: top - parentRect.top,
     left: left - parentRect.left,
@@ -171,6 +175,9 @@ const getAllScrollParents = (el, parents = []) => {
   const parent = el.parentNode;
   if (parent) {
     isScrollElement(parent) && parents.push(parent);
+    if (getStyleComputedProperty(parent, "position") === "fixed") {
+      return parents;
+    }
     return getAllScrollParents(parent, parents);
   }
   return parents;
@@ -374,10 +381,11 @@ Popper.prototype._getBoundaries = function(data, padding, boundariesElement) {
     let isFixed2 = data.offsets.popper.position === "fixed";
     let scrollTop = isFixed2 ? 0 : getScrollTopValue(scrollParent);
     let scrollLeft = isFixed2 ? 0 : getScrollLeftValue(scrollParent);
+    const viewportWindow = getRealWindow();
     boundaries = {
       top: 0 - (offsetParentRect.top - scrollTop),
-      right: window.document.documentElement.clientWidth - (offsetParentRect.left - scrollLeft),
-      bottom: window.document.documentElement.clientHeight - (offsetParentRect.top - scrollTop),
+      right: viewportWindow.document.documentElement.clientWidth - (offsetParentRect.left - scrollLeft),
+      bottom: viewportWindow.document.documentElement.clientHeight - (offsetParentRect.top - scrollTop),
       left: 0 - (offsetParentRect.left - scrollLeft)
     };
   } else {

package/dropdown/index.js

@@ -135,12 +135,14 @@ const initEvent = ({ api, props, state, vm, mode }) => () => {
     }
   }
 };
-const handleMenuItemClick = ({ props, state, emit }) => (itemData, instance, isDisabled) => {
-  state.isDisabled = isDisabled;
-  if (props.hideOnClick) {
-    !state.isDisabled && (state.visible = false);
+const handleMenuItemClick = ({ props, state, emit }) => ({ itemData, vm, disabled }) => {
+  if (props.hideOnClick && !disabled) {
+    state.visible = false;
+  }
+  if (!disabled) {
+    const data = { itemData, vm, disabled };
+    emit("item-click", data);
   }
-  emit("item-click", itemData, instance);
 };
 const triggerElmFocus = ({ state }) => () => {
   state.triggerElm.focus && state.triggerElm.focus();
@@ -185,9 +187,9 @@ const beforeDistory = ({ api, state }) => () => {
     state.dropdownElm = null;
   }
 };
-const clickOutside = ({ props, api, state }) => (value) => {
+const clickOutside = ({ props, api }) => (disabled) => {
   if (props.hideOnClick) {
-    state.isDisabled ? value ? api.show() : api.hide() : api.hide();
+    disabled ? api.show() : api.hide();
   }
 };
 export {

package/dropdown/vue.js

@@ -34,7 +34,6 @@ const renderless = (props, { reactive, watch, provide, onMounted }, { emit, pare
     listId: `dropdown-menu-${guid()}`,
     showIcon: props.showIcon,
     showSelfIcon: props.showSelfIcon,
-    isDisabled: false,
     designConfig
   });
   provide("dropdownVm", vm);
@@ -57,7 +56,7 @@ const renderless = (props, { reactive, watch, provide, onMounted }, { emit, pare
     triggerElmFocus: triggerElmFocus({ state }),
     initDomOperation: initDomOperation({ api: api2, state, vm }),
     beforeDistory: beforeDistory({ api: api2, state }),
-    clickOutside: clickOutside({ state, props, api: api2 })
+    clickOutside: clickOutside({ props, api: api2 })
   });
   watch(() => state.visible, api2.watchVisible);
   watch(() => state.focusing, api2.watchFocusing);

package/dropdown-item/index.js

@@ -92,7 +92,9 @@ const clickOutside = (parent) => () => {
 const handleClick = ({ props, dispatch, vm, emit }) => (event) => {
   event.stopPropagation();
   const data = { itemData: props.itemData, vm, disabled: props.disabled };
-  emit("item-click", data);
+  if (!props.disabled) {
+    emit("item-click", data);
+  }
   dispatch("TinyDropdown", "menu-item-click", data);
   dispatch("TinyDropdown", "is-disabled", [props.disabled]);
 };

package/dropdown-item/mf.js

@@ -32,13 +32,14 @@ const renderless = (props, { reactive, inject }, { dispatch, vm }) => {
       dataStore2.currentIndex = `${props2.currentIndex}`;
     }
     dispatch("TinyDropdown", "selectedIndex", [dataStore2.currentIndex]);
-    dispatch("TinyDropdownMenu", "menu-item-click", [
-      dataStore2.itemData,
-      vm2,
-      dataStore2.itemLabel,
-      dataStore2.showContent,
-      props2.disabled
-    ]);
+    const data = {
+      itemData: dataStore2.itemData,
+      vm: vm2,
+      label: dataStore2.itemLabel,
+      showContent: dataStore2.showContent,
+      disabled: props2.disabled
+    };
+    dispatch("TinyDropdownMenu", "menu-item-click", data);
     dispatch("TinyDropdown", "is-disabled", [props2.disabled]);
   };
   const mouseLeave = ({ dataStore: dataStore2 }) => () => {

package/dropdown-menu/index.js

@@ -129,10 +129,11 @@ const mounted = ({ api, parent, state }) => () => {
     state.showContent = showContent;
   });
 };
-const handleMenuItemClick = ({ state, dispatch }) => (itemData, instance, label, showContent, isDisabled) => {
+const handleMenuItemClick = ({ state, dispatch }) => ({ itemData, vm, label, showContent, disabled }) => {
   state.label = label;
   state.showContent = showContent;
-  dispatch("TinyDropdown", "current-item-click", [itemData, instance, isDisabled]);
+  const data = { itemData, vm, disabled };
+  dispatch("TinyDropdown", "current-item-click", data);
 };
 const handleMouseenter = ({ emit }) => ($event) => {
   emit("mouseenter", $event);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentiny/vue-renderless",
-  "version": "3.10.5",
+  "version": "3.10.7",
   "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
   "homepage": "https://opentiny.design/tiny-vue",
   "keywords": [