shineout 3.9.16-beta.2 → 3.9.16-beta.4

package/cjs/index.js

@@ -522,5 +522,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.9.16-beta.2'
+  version: '3.9.16-beta.4'
 };

package/dist/shineout.js

@@ -12326,7 +12326,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.9.16-beta.2');
+/* harmony default export */ var version = ('3.9.16-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -22528,7 +22528,9 @@ var replaceCssVarValue = function replaceCssVarValue(innerHTML, cssvar, targetVa
   var regex = new RegExp("(".concat(cssvar, ":.*?;)"));
   // 如果没有 token ，则向后插入新的 token
   if (innerHTML.indexOf(cssvar) === -1) {
-    return innerHTML.slice(0, -1) + ";".concat(cssvar, ": ").concat(targetValue, ";") + innerHTML.slice(-1);
+    var before = innerHTML.slice(0, -1);
+    var separator = before.endsWith('{') ? '' : ';';
+    return before + "".concat(separator).concat(cssvar, ": ").concat(targetValue, ";") + innerHTML.slice(-1);
   }
   return innerHTML.replace(regex, "".concat(cssvar, ": ").concat(targetValue, ";"));
 };
@@ -22562,6 +22564,23 @@ var setToken = function setToken(options) {
   var defaultToken = token || token_token;
   var extraToken = getExtraToken(prefix);
   if (update && token) {
+    // 如果标签不存在，先初始化选择器结构并插入 DOM
+    if (!cacheTag) {
+      tag.setAttribute('data-token', tokenName || '');
+      tag.setAttribute('data-token-id', id);
+      tag.setAttribute('data-token-selector', selector);
+      tag.innerHTML = "".concat(selector, " {}");
+      if (!target) {
+        document.head.appendChild(tag);
+      } else if (target instanceof HTMLElement) {
+        target.appendChild(tag);
+      } else if (typeof target === 'string') {
+        var el = document.getElementById(target);
+        if (el instanceof HTMLElement) {
+          el.appendChild(tag);
+        }
+      }
+    }
     Object.keys(token).forEach(function (key) {
       var cssvar = isCustomToken(key) ? key : "--".concat(prefix, "-").concat(camelCaseToDash(key));
       var targetValue = token[key];
@@ -22602,9 +22621,9 @@ var setToken = function setToken(options) {
     return;
   }
   if (typeof target === 'string') {
-    var el = document.getElementById(target);
-    if (el instanceof HTMLElement) {
-      el.appendChild(tag);
+    var _el = document.getElementById(target);
+    if (_el instanceof HTMLElement) {
+      _el.appendChild(tag);
       return;
     }
   }
@@ -32283,7 +32302,16 @@ var usePositionStyle = function usePositionStyle(config) {
       scrollLeft = _getScrollPosition.scrollLeft;
     if (needCheck && scrollElRef !== null && scrollElRef !== void 0 && scrollElRef.current && (_scrollElRef$current = scrollElRef.current) !== null && _scrollElRef$current !== void 0 && _scrollElRef$current.contains(parentElRef.current)) {
       var _scrollElRef$current2;
-      var visibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
+      var rawVisibleRect = ((_scrollElRef$current2 = scrollElRef.current) === null || _scrollElRef$current2 === void 0 ? void 0 : _scrollElRef$current2.getBoundingClientRect()) || {};
+      // 当 scrollElRef 是 html/body 时，若内容全为 fixed 定位，其 getBoundingClientRect 高度会变为 0
+      // 此时应使用 window.innerHeight/innerWidth 作为可视区域判断依据
+      var isDocumentRoot = scrollElRef.current === document.documentElement || scrollElRef.current === document.body;
+      var visibleRect = isDocumentRoot && rawVisibleRect.height === 0 ? {
+        top: 0,
+        left: 0,
+        bottom: window.innerHeight,
+        right: window.innerWidth
+      } : rawVisibleRect;
       if (rect.bottom < visibleRect.top || rect.top > visibleRect.bottom + scrollTop || rect.right < visibleRect.left || rect.left > visibleRect.right + scrollLeft) {
         return {
           style: hideStyle
@@ -76002,7 +76030,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.16-beta.2'
+  version: '3.9.16-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;