@ray-js/components 0.4.11 → 0.4.12

package/lib/PageContainer/index.md

@@ -31,8 +31,8 @@ import { PageContainer } from '@ray-js/components'
 | overlay | boolean | true | 是否显示遮罩层 | 涂鸦、微信、Web |
 | position | string | bottom | 弹出位置，可选值为 top bottom right center | 涂鸦、微信、Web |
 | round | boolean | false | 是否显示圆角 | 涂鸦、微信、Web |
-| overlayStyle | string |  | 自定义遮罩层样式 | 涂鸦、微信、Web |
-| customStyle | string |  | 自定义弹出层样式 | 涂鸦、微信、Web |
+| overlayStyle | string 或 React.CSSProperties |  | 自定义遮罩层样式 | 涂鸦、微信、Web |
+| customStyle | string 或 React.CSSProperties |  | 自定义弹出层样式 | 涂鸦、微信、Web |
 | onBeforeEnter | eventhandle |  | 进入前触发 | 涂鸦、微信、Web |
 | onEnter | eventhandle |  | 进入中触发 | 涂鸦、微信、Web |
 | onAfterEnter | eventhandle |  | 进入后触发 | 涂鸦、微信、Web |

package/lib/PageContainer/props.d.ts

@@ -14,8 +14,8 @@ export declare type PageContainerProps = BaseProps & {
     overlay?: boolean;
     position?: 'top' | 'bottom' | 'right' | 'center';
     round?: boolean;
-    overlayStyle?: string;
-    customStyle?: string;
+    overlayStyle?: string | React.CSSProperties;
+    customStyle?: string | React.CSSProperties;
     onBeforeEnter?: (event: PageContainerEventType) => void;
     onEnter?: (event: PageContainerEventType) => void;
     onAfterEnter?: (event: PageContainerEventType) => void;

package/lib/utils/handleProps.android.js

@@ -1 +1 @@
-var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _frameworkShared=require("@ray-js/framework-shared");var _paramCase=require("param-case");var _excluded=["className","hoverClassName","hoverStyle","refresherDefaultStyle","overlayStyle","customStyle","indicatorStyle","maskStyle","placeholderStyle","borderStyle","style","children"];function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);enumerableOnly&&(symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable;})),keys.push.apply(keys,symbols);}return keys;}function _objectSpread(target){for(var i=1;i<arguments.length;i++){var source=null!=arguments[i]?arguments[i]:{};i%2?ownKeys(Object(source),!0).forEach(function(key){(0,_defineProperty2.default)(target,key,source[key]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(target,Object.getOwnPropertyDescriptors(source)):ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key));});}return target;}var transformStyle=function(originStyle){return Object.entries(originStyle).map(function(_ref){var _ref2=(0,_slicedToArray2.default)(_ref,2),k=_ref2[0],v=_ref2[1];return k+":"+v;}).join(';');};var handleProps=function(props){var className=props.className,hoverClassName=props.hoverClassName,hoverStyle=props.hoverStyle,refresherDefaultStyle=props.refresherDefaultStyle,overlayStyle=props.overlayStyle,customStyle=props.customStyle,indicatorStyle=props.indicatorStyle,maskStyle=props.maskStyle,placeholderStyle=props.placeholderStyle,borderStyle=props.borderStyle,style=props.style,children=props.children,tempProps=(0,_objectWithoutProperties2.default)(props,_excluded);for(var key in tempProps){if(tempProps[key]===false){delete tempProps[key];}else if(typeof tempProps[key]==='object'){tempProps[key]=JSON.stringify(tempProps[key]);}tempProps[(0,_paramCase.paramCase)(key)]=tempProps[key];}return _objectSpread({class:className,style:style&&(0,_frameworkShared.inlineStyle)(style),'hover-class':hoverClassName,'hover-style':hoverStyle&&transformStyle(hoverStyle),'refresher-default-style':refresherDefaultStyle&&transformStyle(hoverStyle),'overlay-style':overlayStyle&&transformStyle(overlayStyle),'custom-style':customStyle&&transformStyle(customStyle),'indicator-style':indicatorStyle&&transformStyle(indicatorStyle),'mask-style':maskStyle&&transformStyle(maskStyle),'placeholder-style':placeholderStyle&&transformStyle(placeholderStyle),'border-style':borderStyle&&transformStyle(borderStyle),children:children},tempProps);};var _default=handleProps;exports.default=_default;
+var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _frameworkShared=require("@ray-js/framework-shared");var _paramCase=require("param-case");var _styleToObject=_interopRequireDefault(require("style-to-object"));var _excluded=["className","hoverClassName","hoverStyle","refresherDefaultStyle","overlayStyle","customStyle","indicatorStyle","maskStyle","placeholderStyle","borderStyle","style","children"];function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);enumerableOnly&&(symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable;})),keys.push.apply(keys,symbols);}return keys;}function _objectSpread(target){for(var i=1;i<arguments.length;i++){var source=null!=arguments[i]?arguments[i]:{};i%2?ownKeys(Object(source),!0).forEach(function(key){(0,_defineProperty2.default)(target,key,source[key]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(target,Object.getOwnPropertyDescriptors(source)):ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key));});}return target;}var transformStyle=function(originStyle){var tempStyle;if(typeof originStyle==='string'){tempStyle=(0,_styleToObject.default)(originStyle);}else{tempStyle=originStyle;}return Object.entries((0,_frameworkShared.inlineStyle)(tempStyle)).map(function(_ref){var _ref2=(0,_slicedToArray2.default)(_ref,2),k=_ref2[0],v=_ref2[1];return k+":"+v;}).join(';');};var handleProps=function(props){var className=props.className,hoverClassName=props.hoverClassName,hoverStyle=props.hoverStyle,refresherDefaultStyle=props.refresherDefaultStyle,overlayStyle=props.overlayStyle,customStyle=props.customStyle,indicatorStyle=props.indicatorStyle,maskStyle=props.maskStyle,placeholderStyle=props.placeholderStyle,borderStyle=props.borderStyle,style=props.style,children=props.children,tempProps=(0,_objectWithoutProperties2.default)(props,_excluded);for(var key in tempProps){if(tempProps[key]===false){delete tempProps[key];}else if(typeof tempProps[key]==='object'){tempProps[key]=JSON.stringify(tempProps[key]);}tempProps[(0,_paramCase.paramCase)(key)]=tempProps[key];}return _objectSpread({class:className,style:style&&(0,_frameworkShared.inlineStyle)(style),'hover-class':hoverClassName,'hover-style':hoverStyle&&transformStyle(hoverStyle),'refresher-default-style':refresherDefaultStyle&&transformStyle(refresherDefaultStyle),'overlay-style':overlayStyle&&transformStyle(overlayStyle),'custom-style':customStyle&&transformStyle(customStyle),'indicator-style':indicatorStyle&&transformStyle(indicatorStyle),'mask-style':maskStyle&&transformStyle(maskStyle),'placeholder-style':placeholderStyle&&transformStyle(placeholderStyle),'border-style':borderStyle&&transformStyle(borderStyle),children:children},tempProps);};var _default=handleProps;exports.default=_default;

package/lib/utils/handleProps.ios.js

@@ -1 +1 @@
-var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _frameworkShared=require("@ray-js/framework-shared");var _paramCase=require("param-case");var _excluded=["className","hoverClassName","hoverStyle","refresherDefaultStyle","overlayStyle","customStyle","indicatorStyle","maskStyle","placeholderStyle","borderStyle","style","children"];function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);enumerableOnly&&(symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable;})),keys.push.apply(keys,symbols);}return keys;}function _objectSpread(target){for(var i=1;i<arguments.length;i++){var source=null!=arguments[i]?arguments[i]:{};i%2?ownKeys(Object(source),!0).forEach(function(key){(0,_defineProperty2.default)(target,key,source[key]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(target,Object.getOwnPropertyDescriptors(source)):ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key));});}return target;}var transformStyle=function(originStyle){return Object.entries(originStyle).map(function(_ref){var _ref2=(0,_slicedToArray2.default)(_ref,2),k=_ref2[0],v=_ref2[1];return k+":"+v;}).join(';');};var handleProps=function(props){var className=props.className,hoverClassName=props.hoverClassName,hoverStyle=props.hoverStyle,refresherDefaultStyle=props.refresherDefaultStyle,overlayStyle=props.overlayStyle,customStyle=props.customStyle,indicatorStyle=props.indicatorStyle,maskStyle=props.maskStyle,placeholderStyle=props.placeholderStyle,borderStyle=props.borderStyle,style=props.style,children=props.children,tempProps=(0,_objectWithoutProperties2.default)(props,_excluded);for(var key in tempProps){if(tempProps[key]===false){delete tempProps[key];}else if(typeof tempProps[key]==='object'){tempProps[key]=JSON.stringify(tempProps[key]);}tempProps[(0,_paramCase.paramCase)(key)]=tempProps[key];}return _objectSpread({class:className,style:style&&(0,_frameworkShared.inlineStyle)(style),'hover-class':hoverClassName,'hover-style':hoverStyle&&transformStyle(hoverStyle),'refresher-default-style':refresherDefaultStyle&&transformStyle(hoverStyle),'overlay-style':overlayStyle&&transformStyle(overlayStyle),'custom-style':customStyle&&transformStyle(customStyle),'indicator-style':indicatorStyle&&transformStyle(indicatorStyle),'mask-style':maskStyle&&transformStyle(maskStyle),'placeholder-style':placeholderStyle&&transformStyle(placeholderStyle),'border-style':borderStyle&&transformStyle(borderStyle),children:children},tempProps);};var _default=handleProps;exports.default=_default;
+var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports.default=void 0;var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _slicedToArray2=_interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));var _frameworkShared=require("@ray-js/framework-shared");var _paramCase=require("param-case");var _styleToObject=_interopRequireDefault(require("style-to-object"));var _excluded=["className","hoverClassName","hoverStyle","refresherDefaultStyle","overlayStyle","customStyle","indicatorStyle","maskStyle","placeholderStyle","borderStyle","style","children"];function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);enumerableOnly&&(symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable;})),keys.push.apply(keys,symbols);}return keys;}function _objectSpread(target){for(var i=1;i<arguments.length;i++){var source=null!=arguments[i]?arguments[i]:{};i%2?ownKeys(Object(source),!0).forEach(function(key){(0,_defineProperty2.default)(target,key,source[key]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(target,Object.getOwnPropertyDescriptors(source)):ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key));});}return target;}var transformStyle=function(originStyle){var tempStyle;if(typeof originStyle==='string'){tempStyle=(0,_styleToObject.default)(originStyle);}else{tempStyle=originStyle;}return Object.entries((0,_frameworkShared.inlineStyle)(tempStyle)).map(function(_ref){var _ref2=(0,_slicedToArray2.default)(_ref,2),k=_ref2[0],v=_ref2[1];return k+":"+v;}).join(';');};var handleProps=function(props){var className=props.className,hoverClassName=props.hoverClassName,hoverStyle=props.hoverStyle,refresherDefaultStyle=props.refresherDefaultStyle,overlayStyle=props.overlayStyle,customStyle=props.customStyle,indicatorStyle=props.indicatorStyle,maskStyle=props.maskStyle,placeholderStyle=props.placeholderStyle,borderStyle=props.borderStyle,style=props.style,children=props.children,tempProps=(0,_objectWithoutProperties2.default)(props,_excluded);for(var key in tempProps){if(tempProps[key]===false){delete tempProps[key];}else if(typeof tempProps[key]==='object'){tempProps[key]=JSON.stringify(tempProps[key]);}tempProps[(0,_paramCase.paramCase)(key)]=tempProps[key];}return _objectSpread({class:className,style:style&&(0,_frameworkShared.inlineStyle)(style),'hover-class':hoverClassName,'hover-style':hoverStyle&&transformStyle(hoverStyle),'refresher-default-style':refresherDefaultStyle&&transformStyle(refresherDefaultStyle),'overlay-style':overlayStyle&&transformStyle(overlayStyle),'custom-style':customStyle&&transformStyle(customStyle),'indicator-style':indicatorStyle&&transformStyle(indicatorStyle),'mask-style':maskStyle&&transformStyle(maskStyle),'placeholder-style':placeholderStyle&&transformStyle(placeholderStyle),'border-style':borderStyle&&transformStyle(borderStyle),children:children},tempProps);};var _default=handleProps;exports.default=_default;

package/lib/utils/handleProps.js

@@ -10,9 +10,18 @@ import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.json.stringify.js";
 import { inlineStyle } from '@ray-js/framework-shared';
 import { paramCase } from 'param-case';
+import s2o from 'style-to-object';
 
 var transformStyle = function (originStyle) {
-  return Object.entries(originStyle).map(function (_ref) {
+  var tempStyle;
+
+  if (typeof originStyle === 'string') {
+    tempStyle = s2o(originStyle);
+  } else {
+    tempStyle = originStyle;
+  }
+
+  return Object.entries(inlineStyle(tempStyle)).map(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 2),
         k = _ref2[0],
         v = _ref2[1];
@@ -55,7 +64,7 @@ var handleProps = function (props) {
     style: style && inlineStyle(style),
     'hover-class': hoverClassName,
     'hover-style': hoverStyle && transformStyle(hoverStyle),
-    'refresher-default-style': refresherDefaultStyle && transformStyle(hoverStyle),
+    'refresher-default-style': refresherDefaultStyle && transformStyle(refresherDefaultStyle),
     'overlay-style': overlayStyle && transformStyle(overlayStyle),
     'custom-style': customStyle && transformStyle(customStyle),
     'indicator-style': indicatorStyle && transformStyle(indicatorStyle),

package/lib/utils/handleProps.tuya.js

@@ -10,9 +10,18 @@ import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.json.stringify.js";
 import { inlineStyle } from '@ray-js/framework-shared';
 import { paramCase } from 'param-case';
+import s2o from 'style-to-object';
 
 var transformStyle = function (originStyle) {
-  return Object.entries(originStyle).map(function (_ref) {
+  var tempStyle;
+
+  if (typeof originStyle === 'string') {
+    tempStyle = s2o(originStyle);
+  } else {
+    tempStyle = originStyle;
+  }
+
+  return Object.entries(inlineStyle(tempStyle)).map(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 2),
         k = _ref2[0],
         v = _ref2[1];
@@ -55,7 +64,7 @@ var handleProps = function (props) {
     style: style && inlineStyle(style),
     'hover-class': hoverClassName,
     'hover-style': hoverStyle && transformStyle(hoverStyle),
-    'refresher-default-style': refresherDefaultStyle && transformStyle(hoverStyle),
+    'refresher-default-style': refresherDefaultStyle && transformStyle(refresherDefaultStyle),
     'overlay-style': overlayStyle && transformStyle(overlayStyle),
     'custom-style': customStyle && transformStyle(customStyle),
     'indicator-style': indicatorStyle && transformStyle(indicatorStyle),

package/lib/utils/handleProps.web.js

@@ -10,9 +10,18 @@ import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.json.stringify.js";
 import { inlineStyle } from '@ray-js/framework-shared';
 import { paramCase } from 'param-case';
+import s2o from 'style-to-object';
 
 var transformStyle = function (originStyle) {
-  return Object.entries(originStyle).map(function (_ref) {
+  var tempStyle;
+
+  if (typeof originStyle === 'string') {
+    tempStyle = s2o(originStyle);
+  } else {
+    tempStyle = originStyle;
+  }
+
+  return Object.entries(inlineStyle(tempStyle)).map(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 2),
         k = _ref2[0],
         v = _ref2[1];
@@ -55,7 +64,7 @@ var handleProps = function (props) {
     style: style && inlineStyle(style),
     'hover-class': hoverClassName,
     'hover-style': hoverStyle && transformStyle(hoverStyle),
-    'refresher-default-style': refresherDefaultStyle && transformStyle(hoverStyle),
+    'refresher-default-style': refresherDefaultStyle && transformStyle(refresherDefaultStyle),
     'overlay-style': overlayStyle && transformStyle(overlayStyle),
     'custom-style': customStyle && transformStyle(customStyle),
     'indicator-style': indicatorStyle && transformStyle(indicatorStyle),

package/lib/utils/handleProps.wechat.js

@@ -10,9 +10,18 @@ import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.json.stringify.js";
 import { inlineStyle } from '@ray-js/framework-shared';
 import { paramCase } from 'param-case';
+import s2o from 'style-to-object';
 
 var transformStyle = function (originStyle) {
-  return Object.entries(originStyle).map(function (_ref) {
+  var tempStyle;
+
+  if (typeof originStyle === 'string') {
+    tempStyle = s2o(originStyle);
+  } else {
+    tempStyle = originStyle;
+  }
+
+  return Object.entries(inlineStyle(tempStyle)).map(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 2),
         k = _ref2[0],
         v = _ref2[1];
@@ -55,7 +64,7 @@ var handleProps = function (props) {
     style: style && inlineStyle(style),
     'hover-class': hoverClassName,
     'hover-style': hoverStyle && transformStyle(hoverStyle),
-    'refresher-default-style': refresherDefaultStyle && transformStyle(hoverStyle),
+    'refresher-default-style': refresherDefaultStyle && transformStyle(refresherDefaultStyle),
     'overlay-style': overlayStyle && transformStyle(overlayStyle),
     'custom-style': customStyle && transformStyle(customStyle),
     'indicator-style': indicatorStyle && transformStyle(indicatorStyle),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/components",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "Ray basic components",
   "keywords": [
     "ray"
@@ -24,8 +24,8 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework-shared": "^0.4.11",
-    "@ray-js/remax-tuya": "^0.4.11",
+    "@ray-js/framework-shared": "^0.4.12",
+    "@ray-js/remax-tuya": "^0.4.12",
     "@remax/macro": "2.15.6",
     "@remax/wechat": "2.15.6",
     "antd-mobile": "^5.0.0-beta.17",
@@ -38,13 +38,14 @@
     "react-autosize-textarea": "^7.1.0",
     "react-native-swiper": "^1.6.0",
     "shifty": "^2.15.2",
+    "style-to-object": "^0.3.0",
     "tuya-panel-icon": "^0.1.1",
     "tuya-panel-motion": "^0.0.2",
     "tuya-panel-slider": "^0.1.1",
     "tuya-panel-switch": "^0.1.1"
   },
   "devDependencies": {
-    "@ray-js/cli": "^0.4.11"
+    "@ray-js/cli": "^0.4.12"
   },
   "maintainers": [
     {
@@ -52,6 +53,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "e2e0f5ed5ad14b6c8b2a490d253facb9342387a9",
+  "gitHead": "2ac747db1f49c6f391d916eb697d5900f0736de3",
   "repository": {}
 }