@easyv/react-components 0.3.14 → 0.3.16

package/dist/ColorsPicker/interface.d.ts

@@ -6,7 +6,7 @@
  * pures - 多纯色集合
  */
 export declare type ColorType = 'pure' | 'linear' | 'pures' | 'range';
-interface StopItem {
+export interface StopItem {
     /**
      * 偏移量
      * 0 - 100
@@ -58,4 +58,3 @@ export interface Color {
     hsv: HSV;
     alpha: number;
 }
-export {};

package/dist/ColorsPicker/utils.d.ts

@@ -1,19 +1,13 @@
-import { ColorValueMap } from './interface';
-export declare function toHex(x: any): string;
+import { ColorValueMap, StopItem } from './interface';
+export declare function toHex(x: number | string): string;
 export declare function resolveColor(colorParam: string): {
-    r?: undefined;
-    g?: undefined;
-    b?: undefined;
-    a?: undefined;
-    hex?: undefined;
-} | {
-    r: any;
-    g: any;
-    b: any;
-    a: any;
+    r: number;
+    g: number;
+    b: number;
+    a: number;
     hex: string;
 };
-export declare function transformColor(color: any, a: any): string | undefined;
+export declare function transformColor(color: string, a: number): string;
 export declare function getBackgroundAccordingColor(color: any, fixedAngle?: number): {
     backgroundImage: string;
     background?: undefined;
@@ -21,7 +15,7 @@ export declare function getBackgroundAccordingColor(color: any, fixedAngle?: num
     background: any;
     backgroundImage?: undefined;
 } | undefined;
-export declare function getMiddleColor(colors: any, offset: any): any;
+export declare function getMiddleColor(colors: StopItem[], offset: number): any;
 export declare function getHexValue(hex: string): string;
 export declare function getLinearGradientStyle(color: ColorValueMap['linear']): {
     backgroundImage: string;

package/dist/ColorsPicker/utils.js

@@ -1,42 +1,51 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import tinycolor from 'tinycolor2';
 export function toHex(x) {
-  return ('0' + parseInt(x).toString(16)).slice(-2);
+  return ('0' + parseInt(x + '').toString(16)).slice(-2);
 }
 export function resolveColor(colorParam) {
   if (!colorParam || typeof colorParam !== 'string') {
-    return {};
+    return {
+      r: 255,
+      g: 255,
+      b: 255,
+      a: 1,
+      hex: '#ffffff'
+    };
   }
 
   // 转为小写并去除空格
-  var color = colorParam.toLowerCase().replace(/\s+/g, '');
-  var hexReg = /^#([0-9|a-f]{3}|[0-9|a-f]{6})$/;
-  var rgbReg = /^(rgb\(\d+,\d+,\d+\)|rgba\(\d+,\d+,\d+,(\d+)?(\.)?(\d+)?\))$/;
-  // const rgbReg1 = /^(rgb\(\d+,\d+,\d+\)|rgba\((\d+)?(\.)?(\d+)?,(\d+)?(\.)?(\d+)?,(\d+)?(\.)?(\d+)?,(\d+)?(\.)?(\d+)?\))$/;
+  // const color = colorParam.toLowerCase().replace(/\s+/g, '');
+  // const hexReg = /^#([0-9|a-f]{3}|[0-9|a-f]{6})$/;
+  // const rgbReg = /^(rgb\(\d+,\d+,\d+\)|rgba\(\d+,\d+,\d+,(\d+)?(\.)?(\d+)?\))$/;
 
-  var r, g, b, a;
-  if (hexReg.test(color)) {
-    if (color.length === 4) {
-      r = parseInt(color.slice(1, 2) + color.slice(1, 2), 16);
-      g = parseInt(color.slice(2, 3) + color.slice(2, 3), 16);
-      b = parseInt(color.slice(3, 4) + color.slice(3, 4), 16);
-    } else {
-      r = parseInt(color.slice(1, 3), 16);
-      g = parseInt(color.slice(3, 5), 16);
-      b = parseInt(color.slice(5, 7), 16);
-    }
-    a = 1;
-  } else if (rgbReg.test(color)) {
-    var colors = color.replace(/rgba|rgb|\(|\)/g, '').split(',');
-    r = Number(colors[0]);
-    g = Number(colors[1]);
-    b = Number(colors[2]);
-    a = colors.length === 4 ? Number(colors[3]) : 1;
-  } else {
-    return {};
-  }
+  // let r, g, b, a;
+  // if (hexReg.test(color)) {
+  //   if (color.length === 4) {
+  //     r = parseInt(color.slice(1, 2) + color.slice(1, 2), 16);
+  //     g = parseInt(color.slice(2, 3) + color.slice(2, 3), 16);
+  //     b = parseInt(color.slice(3, 4) + color.slice(3, 4), 16);
+  //   } else {
+  //     r = parseInt(color.slice(1, 3), 16);
+  //     g = parseInt(color.slice(3, 5), 16);
+  //     b = parseInt(color.slice(5, 7), 16);
+  //   }
+  //   a = 1;
+  // } else if (rgbReg.test(color)) {
+  //   let colors = color.replace(/rgba|rgb|\(|\)/g, '').split(',');
+  //   r = Number(colors[0]);
+  //   g = Number(colors[1]);
+  //   b = Number(colors[2]);
+  //   a = colors.length === 4 ? Number(colors[3]) : 1;
+  // } else {
+  //   return {};
+  // }
 
-  // return { r: Math.floor(r), g: Math.floor(g), b: Math.floor(b), a, hex: `#${toHex(r)}${toHex(g)}${toHex(b)}` };
+  var _tinycolor$toRgb = tinycolor(colorParam).toRgb(),
+    r = _tinycolor$toRgb.r,
+    g = _tinycolor$toRgb.g,
+    b = _tinycolor$toRgb.b,
+    a = _tinycolor$toRgb.a;
   return {
     r: r,
     g: g,
@@ -179,9 +188,6 @@ export function getMiddleColor(colors, offset) {
   if (!rightColor) {
     return leftColor.color;
   }
-
-  // console.log(leftColor, rightColor, leftColors, rightColors, '计算color');
-
   var _resolveColor6 = resolveColor(leftColor.color),
     leftR = _resolveColor6.r,
     leftG = _resolveColor6.g,
@@ -192,9 +198,6 @@ export function getMiddleColor(colors, offset) {
     rightG = _resolveColor7.g,
     rightB = _resolveColor7.b,
     rightA = _resolveColor7.a;
-
-  // console.log(resolveColor(leftColor.color), resolveColor(rightColor.color), '计算color');
-
   var newR = Math.round((rightR - leftR) / (rightColor.offset - leftColor.offset) * (offset - leftColor.offset) + leftR);
   var newG = Math.round((rightG - leftG) / (rightColor.offset - leftColor.offset) * (offset - leftColor.offset) + leftG);
   var newB = Math.round((rightB - leftB) / (rightColor.offset - leftColor.offset) * (offset - leftColor.offset) + leftB);

package/dist/Slider/index.less

@@ -0,0 +1,12 @@
+.arco-slider {
+  .arco-slider-road.arco-slider-road-disabled {
+    .arco-slider-bar {
+      background-color: rgb(var(--primary-3));
+    }
+
+    .arco-slider-button::after {
+      border-color: rgb(var(--primary-3));
+      background-color: var(--color-text-4);
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/react-components",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "description": "a react component library base on arco design",
   "license": "MIT",
   "sideEffects": [