clxx 2.1.2 → 2.1.3

package/build/utils/cssUtil.d.ts

@@ -1,4 +1,4 @@
-import { CSSProperties } from "@emotion/serialize";
+import { Interpolation, Theme } from '@emotion/react';
 /**
  * 匹配所有的CSS数值类型的值
  */
@@ -39,4 +39,4 @@ export declare function splitValue(value: number | string, defaultUnit?: string)
  * @param style
  * @returns
  */
-export declare function adaptive(style: Partial<Record<keyof CSSProperties, number | string>>): import("@emotion/utils").SerializedStyles;
+export declare function adaptive(style: Record<string, Interpolation<Theme>>): import("@emotion/utils").SerializedStyles;

package/build/utils/cssUtil.js

@@ -1,5 +1,5 @@
-import { css } from "@emotion/react";
-import { getContextValue } from "../context";
+import { css } from '@emotion/react';
+import { getContextValue } from '../context';
 /**
  * 匹配所有的CSS数值类型的值
  */
@@ -10,11 +10,11 @@ export const CSSValueReg = /^((?:\-)?(?:\d+\.?|\.\d+|\d+\.\d+))([a-zA-Z%]*)$/;
  * @param value 长度值
  * @param defaultUnit 默认长度值单位
  */
-export function normalizeUnit(value, defaultUnit = "px") {
-    if (typeof value === "number") {
+export function normalizeUnit(value, defaultUnit = 'px') {
+    if (typeof value === 'number') {
         return value + defaultUnit;
     }
-    if (typeof value === "string") {
+    if (typeof value === 'string') {
         const result = value.match(CSSValueReg);
         if (Array.isArray(result)) {
             return result[2]
@@ -39,17 +39,17 @@ export function normalizeUnit(value, defaultUnit = "px") {
  * @param value
  * @param defaultUnit
  */
-export function splitValue(value, defaultUnit = "px") {
-    if (typeof value === "number") {
+export function splitValue(value, defaultUnit = 'px') {
+    if (typeof value === 'number') {
         return { num: value, unit: defaultUnit };
     }
-    if (typeof value === "string") {
+    if (typeof value === 'string') {
         const result = value.match(CSSValueReg);
         if (Array.isArray(result)) {
             return { num: parseFloat(result[1]), unit: result[2] || defaultUnit };
         }
     }
-    throw new Error("Invalid numeric format");
+    throw new Error('Invalid numeric format');
 }
 /**
  * 生成自适应的样式，仅供库内部使用
@@ -65,13 +65,24 @@ export function adaptive(style) {
     const normal = {};
     for (let name in style) {
         let value = style[name];
-        if (typeof value !== "number") {
+        if (typeof value !== 'number') {
+            normal[name] = value;
+        }
+        else if ([
+            'flex',
+            'flexGrow',
+            'flexShrink',
+            'lineHeight',
+            'fontWeight',
+            'zIndex',
+        ].includes(name) &&
+            typeof value === 'number') {
             normal[name] = value;
         }
         else {
-            normal[name] = (value * 100) / 750 + "vw";
-            max[name] = (value * ctx.maxDocWidth) / 750 + "px";
-            min[name] = (value * ctx.minDocWidth) / 750 + "px";
+            normal[name] = (value * 100) / 750 + 'vw';
+            max[name] = (value * ctx.maxDocWidth) / 750 + 'px';
+            min[name] = (value * ctx.minDocWidth) / 750 + 'px';
         }
     }
     return css(Object.assign(Object.assign({}, normal), { [`@media (min-width: ${ctx.maxDocWidth}px)`]: max, [`@media (max-width: ${ctx.minDocWidth}px)`]: min }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clxx",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Basic JS library for mobile devices",
   "main": "./build/index.js",
   "module": "./build/index.js",