mp-darkmode 1.2.3-beta.3 → 1.2.3-beta.5

package/dist/darkmode.js

@@ -3425,6 +3425,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 // 节点相关操作工具API
 
+var isImageUrlKey = function isImageUrlKey(key, value) {
+  var isBackgroundAttr = /^background/.test(key);
+  var isBorderImageAttr = /^(-webkit-)?border-image/.test(key);
+  return (isBackgroundAttr || isBorderImageAttr) && /url\([^)]*\)/i.test(value);
+};
 var SDK = /*#__PURE__*/function () {
   // 当前是否需要运行Darkmode处理
 
@@ -3497,11 +3502,11 @@ var SDK = /*#__PURE__*/function () {
               isTextColor: true,
               parentElementBgColorStr: newColor || color
             }, isUpdate, needReset);
-            if (ret.newColor) {
-              extStyle += _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.genCssKV('color', ret.newColor);
-            } else {
-              extStyle += _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.genCssKV('color', parentTextColor);
-            }
+            extStyle += _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.genCssKV('color', ret.newColor || parentTextColor);
+            (0,_domUtils__WEBPACK_IMPORTED_MODULE_5__.getChildrenAndIt)(el).forEach(function (dom) {
+              dom[_constant__WEBPACK_IMPORTED_MODULE_2__.COLORATTR] = ret.newColor || parentTextColor;
+              dom[_constant__WEBPACK_IMPORTED_MODULE_2__.ORIGINAL_COLORATTR] = parentTextColor;
+            });
           }
         }
       } else if (options.isTextColor || options.isBorderColor) {
@@ -3612,6 +3617,7 @@ var SDK = /*#__PURE__*/function () {
     value: function _updateBgWithGradient(gradientColor, el, className, cssKVList, hasInlineColor, isUpdate, needReset) {
       var newBgColor = (0,_color__WEBPACK_IMPORTED_MODULE_1__.mixColors)([el[_constant__WEBPACK_IMPORTED_MODULE_2__.BGCOLORATTR] || _config__WEBPACK_IMPORTED_MODULE_3__["default"].defaultDarkBgColor, gradientColor], 'normal');
       var newOriginalBgColor = (el[_constant__WEBPACK_IMPORTED_MODULE_2__.ORIGINAL_BGCOLORATTR] || _config__WEBPACK_IMPORTED_MODULE_3__["default"].defaultLightBgColor).split(_constant__WEBPACK_IMPORTED_MODULE_2__.BG_COLOR_DELIMITER).concat(gradientColor.toString()).join(_constant__WEBPACK_IMPORTED_MODULE_2__.BG_COLOR_DELIMITER);
+      // TODO: 问题出在这里，el[BGCOLORATTR]里有正确的背景色，然后被gradientColor覆盖了，导致字体颜色计算错误
       (0,_domUtils__WEBPACK_IMPORTED_MODULE_5__.getChildrenAndIt)(el).forEach(function (dom) {
         dom[_constant__WEBPACK_IMPORTED_MODULE_2__.BGCOLORATTR] = newBgColor;
         dom[_constant__WEBPACK_IMPORTED_MODULE_2__.ORIGINAL_BGCOLORATTR] = newOriginalBgColor;
@@ -3913,9 +3919,7 @@ var SDK = /*#__PURE__*/function () {
             if (!(el instanceof SVGElement)) {
               // 先不处理SVG
               // 背景图片、边框图片
-              var isBackgroundAttr = /^background/.test(key);
-              var isBorderImageAttr = /^(-webkit-)?border-image/.test(key);
-              if ((isBackgroundAttr || isBorderImageAttr) && /url\([^)]*\)/i.test(value)) {
+              if (isImageUrlKey(key, value)) {
                 cssChange = true;
                 var imgBgColor = (0,_color__WEBPACK_IMPORTED_MODULE_1__.mixColors)((el[_constant__WEBPACK_IMPORTED_MODULE_2__.ORIGINAL_BGCOLORATTR] || _config__WEBPACK_IMPORTED_MODULE_3__["default"].defaultLightBgColor).split(_constant__WEBPACK_IMPORTED_MODULE_2__.BG_COLOR_DELIMITER), 'normal').toString();
                 // const imgBgColor = el[BGCOLORATTR] || config.defaultLightBgColor;
@@ -3934,7 +3938,7 @@ var SDK = /*#__PURE__*/function () {
                   }
 
                   // background-image
-                  if (isBackgroundAttr) {
+                  if (/^background/.test(key)) {
                     tmpCssKvStr = _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.genCssKV(key, imgBgColor ? "".concat(newValue, ",linear-gradient(").concat(imgBgColor, ", ").concat(imgBgColor, ")") : newValue);
                     if (elBackgroundPositionAttr) {
                       cssKV += _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.genCssKV('background-position', elBackgroundPositionAttr);
@@ -4018,7 +4022,14 @@ var SDK = /*#__PURE__*/function () {
                   noColor = false;
                   _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.unwatch('color');
                 }
-                cssKV += _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.genCssKV(key, !cssChange && needReset ? el.style[key] : value);
+                if (cssChange) {
+                  cssKV += _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.genCssKV(key, value);
+                } else {
+                  if (!(el instanceof SVGElement && isImageUrlKey(key, value))) {
+                    // SVG的图片不需要覆写
+                    cssKV += _global__WEBPACK_IMPORTED_MODULE_4__.cssUtils.genCssKV(key, el.style[key]);
+                  }
+                }
               }
             }
           });