@ray-js/lamp-circle-picker 1.0.2-beta-1 → 1.0.2

package/README.md

@@ -23,7 +23,7 @@ $ yarn add @ray-js/components-ty-lamp
 ```tsx
 interface IProps {
   /**
-   * @description.zh 默认数值
+   * @description.zh 默认数值 色温值
    * @description.en default value
    * @default
    */
@@ -40,18 +40,6 @@ interface IProps {
    * @default 140
    */
   radius?: number;
-  /**
-   * @description.zh 是否展示色圈
-   * @description.en Whether to show color circle
-   * @default true
-   */
-  isShowThumb?: boolean;
-  /**
-   * @description.zh 是否当前颜色文案
-   * @description.en Whether the current color text
-   * @default false
-   */
-  isShowColorTip?: boolean;
   /**
    * @description.zh 手指按下时的回调函数
    * @description.en Finger press when the callback function
@@ -84,8 +72,6 @@ export default () => {
   const handleEnd = (v: number) => {
     setTemperature(v);
   };
-  return (
-    <LampCirclePicker temperature={temperature} onTouchMove={handleMove} onTouchEnd={handleEnd} />
-  );
+  return <LampCirclePicker value={temperature} onTouchMove={handleMove} onTouchEnd={handleEnd} />;
 };
 ```

package/lib/component/index.js

@@ -6,7 +6,6 @@ export default function RectColor(props) {
     radius: props.radius,
     innerRingRadius: props.innerRingRadius,
     value: props.value,
-    isShowColorTip: props.isShowColorTip,
     bindstart: function onTouchStart(e) {
       var detail = e.detail;
       var temp = Math.floor(detail);

package/lib/component/props.d.ts

@@ -17,18 +17,6 @@ export interface IProps {
      * @default 140
      */
     radius?: number;
-    /**
-     * @description.zh 是否展示色圈
-     * @description.en Whether to show color circle
-     * @default true
-     */
-    isShowThumb?: boolean;
-    /**
-     * @description.zh 是否当前颜色文案
-     * @description.en Whether the current color text
-     * @default false
-     */
-    isShowColorTip?: boolean;
     /**
      * @description.zh 手指按下时的回调函数
      * @description.en Finger press when the callback function

package/lib/component/props.js

@@ -3,11 +3,10 @@ var nilFn = function () {
   return null;
 };
 export var defaultProps = {
+  value: 0,
   innerRingRadius: 80,
   radius: 140,
-  isShowThumb: true,
   onTouchStart: nilFn,
   onTouchMove: nilFn,
-  onTouchEnd: nilFn,
-  value: 0
+  onTouchEnd: nilFn
 };

package/lib/component/rjs/index.js

@@ -25,10 +25,6 @@ Component({
       type: Number,
       value: 0
     },
-    isShowColorTip: {
-      type: Boolean,
-      value: true
-    },
     onTouchStart: Function,
     onTouchMove: Function,
     onTouchEnd: Function

package/lib/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
 interface IProps {
-    isShowColorTip?: boolean;
     radius?: number;
     innerRingRadius?: number;
-    temperature: number;
+    value: number;
+    temperature?: number;
     onTouchStart?: (v: number) => void;
     onTouchMove?: (v: number) => void;
     onTouchEnd?: (v: number) => void;
@@ -13,7 +13,6 @@ declare const WhiteRing: {
     defaultProps: {
         radius: number;
         innerRingRadius: number;
-        isShowColorTip: boolean;
         onTouchStart: () => null;
         onTouchMove: () => null;
         onTouchEnd: () => null;

package/lib/index.js

@@ -8,20 +8,21 @@ import AnnulusPickerColor from './component';
 import styled from './index.module.less';
 var ring = res.ring;
 var WhiteRing = function (props) {
-  var temperature = props.temperature,
+  var value = props.value,
+    temperature = props.temperature,
     radius = props.radius,
     innerRingRadius = props.innerRingRadius,
-    isShowColorTip = props.isShowColorTip,
     onTouchStart = props.onTouchStart,
     onTouchMove = props.onTouchMove,
     onTouchEnd = props.onTouchEnd;
+  var innerImgRadius = innerRingRadius * 4 * 0.8;
+  var _value = value !== null && value !== void 0 ? value : temperature;
   return /*#__PURE__*/React.createElement(View, {
     className: clsx(styled.container, styled.flexCenter)
   }, /*#__PURE__*/React.createElement(AnnulusPickerColor, {
-    value: temperature,
+    value: _value,
     radius: radius,
     innerRingRadius: innerRingRadius,
-    isShowColorTip: isShowColorTip,
     onTouchStart: onTouchStart,
     onTouchMove: onTouchMove,
     onTouchEnd: onTouchEnd
@@ -29,12 +30,16 @@ var WhiteRing = function (props) {
     className: clsx(styled.innerBox, styled.flexCenter)
   }, /*#__PURE__*/React.createElement(Image, {
     src: ring,
-    className: styled.ringIcon
+    className: styled.ringIcon,
+    style: {
+      width: innerImgRadius,
+      height: innerImgRadius
+    }
   }), /*#__PURE__*/React.createElement(View, {
     className: clsx(styled.textBox, styled.flexCenter)
   }, /*#__PURE__*/React.createElement(Text, {
     className: styled.title
-  }, Math.trunc(temperature / 10), "%"), /*#__PURE__*/React.createElement(Text, {
+  }, Math.trunc(_value / 10), "%"), /*#__PURE__*/React.createElement(Text, {
     className: styled.desc
   }, Strings.getLang('temperature')))));
 };
@@ -44,7 +49,6 @@ var nilFn = function () {
 WhiteRing.defaultProps = {
   radius: 140,
   innerRingRadius: 80,
-  isShowColorTip: true,
   onTouchStart: nilFn,
   onTouchMove: nilFn,
   onTouchEnd: nilFn

package/lib/props.d.ts

@@ -17,18 +17,6 @@ export interface IProps {
      * @default 140
      */
     radius?: number;
-    /**
-     * @description.zh 是否展示色圈
-     * @description.en Whether to show color circle
-     * @default true
-     */
-    isShowThumb?: boolean;
-    /**
-     * @description.zh 是否当前颜色文案
-     * @description.en Whether the current color text
-     * @default false
-     */
-    isShowColorTip?: boolean;
     /**
      * @description.zh 手指按下时的回调函数
      * @description.en Finger press when the callback function

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lamp-circle-picker",
-  "version": "1.0.2-beta-1",
+  "version": "1.0.2",
   "description": "照明缺角色环",
   "main": "lib/index",
   "files": [