@ray-js/adapter 1.3.0-beta.3 → 1.3.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [1.2.16-beta-1](./compare/v1.2.16-alpha.2...v1.2.16-beta-1) (2023-05-22)
+
+**Note:** Version bump only for package @ray-js/adapter
+
+## [1.3.0-beta.2-beta-2](./compare/v1.3.0-beta.2-beta-1...v1.3.0-beta.2-beta-2) (2023-05-11)
+
+**Note:** Version bump only for package @ray-js/adapter
+
+## [1.3.0-beta.2-beta-1](./compare/v1.2.9...v1.3.0-beta.2-beta-1) (2023-05-11)
+
+**Note:** Version bump only for package @ray-js/adapter
+
 ### [0.10.3-beta-1](./compare/v0.9.4...v0.10.3-beta-1) (2023-04-03)
 
 **Note:** Version bump only for package @ray-js/adapter

package/cjs/hostComponents/ScrollView/index.d.ts

@@ -20,8 +20,12 @@ export interface ScrollViewProps extends BaseProps {
     refresherBackground?: string;
     refresherTriggered: boolean;
     onRefresherPulling?: (event: GenericEvent) => void;
+    onRefresherpulling?: (event: GenericEvent) => void;
     onRefresherRefresh?: (event: GenericEvent) => void;
+    onRefresherrefresh?: (event: GenericEvent) => void;
     onRefresherRestore?: (event: GenericEvent) => void;
+    onRefresherrestore?: (event: GenericEvent) => void;
     onRefresherAbort?: (event: GenericEvent) => void;
+    onRefresherabort?: (event: GenericEvent) => void;
 }
 export declare const ScrollView: React.ComponentType<ScrollViewProps>;

package/cjs/hostComponents/ScrollView/node.d.ts

@@ -21,9 +21,13 @@ export declare const alias: {
     refresherDefaultStyle: string;
     refresherBackground: string;
     refresherTriggered: string;
+    onRefresherPulling: string;
     onRefresherpulling: string;
+    onRefresherRefresh: string;
     onRefresherrefresh: string;
+    onRefresherRestore: string;
     onRefresherrestore: string;
+    onRefresherAbort: string;
     onRefresherabort: string;
     disableScroll: string;
     hoverClass: string;

package/cjs/hostComponents/ScrollView/node.js

@@ -4,5 +4,5 @@ exports.props = exports.alias = void 0;
 const universal_1 = require("../universal");
 exports.alias = Object.assign(Object.assign({}, universal_1.universalAlias), { id: 'id', className: 'class', animation: 'animation', style: 'style', scrollX: 'scroll-x', scrollY: 'scroll-y', upperThreshold: 'upper-threshold', lowerThreshold: 'lower-threshold', scrollTop: 'scroll-top', scrollLeft: 'scroll-left', scrollIntoView: 'scroll-into-view', scrollWithAnimation: 'scroll-with-animation', enableBackToTop: 'enable-back-to-top', enableFlex: 'enable-flex', onScrollToUpper: 'bindscrolltoupper', onScrollToLower: 'bindscrolltolower', onScroll: 'bindscroll', 
     /* 0.9.3新增 */
-    refresherEnabled: 'refresher-enabled', refresherThreshold: 'refresher-threshold', refresherDefaultStyle: 'refresher-default-style', refresherBackground: 'refresher-background', refresherTriggered: 'refresher-triggered', onRefresherpulling: 'bindrefresherpulling', onRefresherrefresh: 'bindrefresherrefresh', onRefresherrestore: 'bindrefresherrestore', onRefresherabort: 'bindrefresherabort' });
+    refresherEnabled: 'refresher-enabled', refresherThreshold: 'refresher-threshold', refresherDefaultStyle: 'refresher-default-style', refresherBackground: 'refresher-background', refresherTriggered: 'refresher-triggered', onRefresherPulling: 'bindrefresherpulling', onRefresherpulling: 'bindrefresherpulling', onRefresherRefresh: 'bindrefresherrefresh', onRefresherrefresh: 'bindrefresherrefresh', onRefresherRestore: 'bindrefresherrestore', onRefresherrestore: 'bindrefresherrestore', onRefresherAbort: 'bindrefresherabort', onRefresherabort: 'bindrefresherabort' });
 exports.props = Object.values(exports.alias);

package/cjs/hostComponents/View/node.d.ts

@@ -1,4 +1,5 @@
 export declare const alias: {
+    catchTouchMove: string;
     id: string;
     disableScroll: string;
     hoverClass: string;

package/cjs/hostComponents/View/node.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.props = exports.alias = void 0;
 const universal_1 = require("../universal");
-exports.alias = universal_1.universalAlias;
+exports.alias = Object.assign(Object.assign({}, universal_1.universalAlias), { catchTouchMove: 'catchtouchmove' });
 exports.props = Object.values(exports.alias);

package/esm/hostComponents/ScrollView/index.d.ts

@@ -20,8 +20,12 @@ export interface ScrollViewProps extends BaseProps {
     refresherBackground?: string;
     refresherTriggered: boolean;
     onRefresherPulling?: (event: GenericEvent) => void;
+    onRefresherpulling?: (event: GenericEvent) => void;
     onRefresherRefresh?: (event: GenericEvent) => void;
+    onRefresherrefresh?: (event: GenericEvent) => void;
     onRefresherRestore?: (event: GenericEvent) => void;
+    onRefresherrestore?: (event: GenericEvent) => void;
     onRefresherAbort?: (event: GenericEvent) => void;
+    onRefresherabort?: (event: GenericEvent) => void;
 }
 export declare const ScrollView: React.ComponentType<ScrollViewProps>;

package/esm/hostComponents/ScrollView/node.d.ts

@@ -21,9 +21,13 @@ export declare const alias: {
     refresherDefaultStyle: string;
     refresherBackground: string;
     refresherTriggered: string;
+    onRefresherPulling: string;
     onRefresherpulling: string;
+    onRefresherRefresh: string;
     onRefresherrefresh: string;
+    onRefresherRestore: string;
     onRefresherrestore: string;
+    onRefresherAbort: string;
     onRefresherabort: string;
     disableScroll: string;
     hoverClass: string;

package/esm/hostComponents/ScrollView/node.js

@@ -1,5 +1,5 @@
 import { universalAlias } from '../universal';
 export const alias = Object.assign(Object.assign({}, universalAlias), { id: 'id', className: 'class', animation: 'animation', style: 'style', scrollX: 'scroll-x', scrollY: 'scroll-y', upperThreshold: 'upper-threshold', lowerThreshold: 'lower-threshold', scrollTop: 'scroll-top', scrollLeft: 'scroll-left', scrollIntoView: 'scroll-into-view', scrollWithAnimation: 'scroll-with-animation', enableBackToTop: 'enable-back-to-top', enableFlex: 'enable-flex', onScrollToUpper: 'bindscrolltoupper', onScrollToLower: 'bindscrolltolower', onScroll: 'bindscroll', 
     /* 0.9.3新增 */
-    refresherEnabled: 'refresher-enabled', refresherThreshold: 'refresher-threshold', refresherDefaultStyle: 'refresher-default-style', refresherBackground: 'refresher-background', refresherTriggered: 'refresher-triggered', onRefresherpulling: 'bindrefresherpulling', onRefresherrefresh: 'bindrefresherrefresh', onRefresherrestore: 'bindrefresherrestore', onRefresherabort: 'bindrefresherabort' });
+    refresherEnabled: 'refresher-enabled', refresherThreshold: 'refresher-threshold', refresherDefaultStyle: 'refresher-default-style', refresherBackground: 'refresher-background', refresherTriggered: 'refresher-triggered', onRefresherPulling: 'bindrefresherpulling', onRefresherpulling: 'bindrefresherpulling', onRefresherRefresh: 'bindrefresherrefresh', onRefresherrefresh: 'bindrefresherrefresh', onRefresherRestore: 'bindrefresherrestore', onRefresherrestore: 'bindrefresherrestore', onRefresherAbort: 'bindrefresherabort', onRefresherabort: 'bindrefresherabort' });
 export const props = Object.values(alias);

package/esm/hostComponents/View/node.d.ts

@@ -1,4 +1,5 @@
 export declare const alias: {
+    catchTouchMove: string;
     id: string;
     disableScroll: string;
     hoverClass: string;

package/esm/hostComponents/View/node.js

@@ -1,3 +1,3 @@
 import { universalAlias } from '../universal';
-export const alias = universalAlias;
+export const alias = Object.assign(Object.assign({}, universalAlias), { catchTouchMove: 'catchtouchmove' });
 export const props = Object.values(alias);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/adapter",
-  "version": "1.3.0-beta.3",
+  "version": "1.3.0",
   "description": "Ray adapter for tuya",
   "keywords": [
     "ray"
@@ -21,7 +21,7 @@
     "watch": "concurrently 'yarn build:cjs --watch' 'yarn build:esm --watch'"
   },
   "devDependencies": {
-    "@ray-js/types": "^1.3.0-beta.3",
+    "@ray-js/types": "^1.3.0",
     "concurrently": "^6.2.1"
   },
   "maintainers": [
@@ -31,10 +31,10 @@
     }
   ],
   "dependencies": {
-    "@ray-core/runtime": "^0.3.0-beta.4",
-    "@ray-core/shared": "^0.3.0-beta.4",
-    "@ray-core/types": "^0.3.0-beta.4"
+    "@ray-core/runtime": "^0.3.0",
+    "@ray-core/shared": "^0.3.0",
+    "@ray-core/types": "^0.3.0"
   },
-  "gitHead": "be72a5dad6214ebf9c6653df02956374c735c98e",
+  "gitHead": "f7f96c375a429a2fa94452b0a9af3f841572921a",
   "repository": {}
 }

package/templates/component.ejs

@@ -1,47 +1,75 @@
 <template name="REMAX_TPL_<%=id%>">
-  <<%=id%>
-  <%_ for(let i=0;i < props.length; i++) { -%>
-    <%=props[i]%>="{{i.props['<%=props[i]%>']}}"
-  <%_ } -%>
-  >
-    <%_ if (id === 'swiper') { -%>
-    <block ty:for="{{i.children}}" ty:key="*this">
-      <swiper-item key="{{i.nodes[item].props.key}}">
-        <block ty:for="{{i.nodes[item].children}}" ty:key="*this" ty:for-item="sItem">
-          <template is="{{'REMAX_TPL_' + i.nodes[item].nodes[sItem].type}}" data="{{i: i.nodes[item].nodes[sItem]}}" />
-        </block>
-      </swiper-item>
+  <%_ if (id === 'view') { -%>
+    <block ty:if="{{i.props['catchtouchmove']}}">
+      <<%=id%>
+      <%# view 标签需要区分是否含 catchtouchmove 事件，区分渲染模板 避免冲突 -%>
+      <%pp1 = props.filter(k => k !== 'bindtouchmove')-%>
+      <%_ for(let i=0;i < pp1.length; i++) { -%>
+        <%=pp1[i]%>="{{i.props['<%=pp1[i]%>']}}"
+      <%_ } -%>
+      >
+      <block ty:for="{{i.children}}" ty:key="*this">
+        <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
+      </block>
+      </<%=id%>>
     </block>
-    <%_ } else if (id === 'picker-view') { -%>
-    <block ty:for="{{i.children}}" ty:key="*this">
-      <picker-view-column>
-        <block ty:for="{{i.nodes[item].children}}" ty:for-item="sItem">
-          <template is="{{'REMAX_TPL_' + i.nodes[item].nodes[sItem].type}}" data="{{i: i.nodes[item].nodes[sItem]}}" />
-        </block>
-      </picker-view-column>
+    <block ty:else>
+      <<%=id%>
+      <%pp2 = props.filter(k => k !== 'catchtouchmove')-%>
+      <%_ for(let i=0;i < pp2.length; i++) { -%>
+        <%=pp2[i]%>="{{i.props['<%=pp2[i]%>']}}"
+      <%_ } -%>
+      >
+      <block ty:for="{{i.children}}" ty:key="*this">
+        <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
+      </block>
+      </<%=id%>>
     </block>
-    <%_ } else if (type === 'native') { -%>
-    <block ty:for="{{i.children}}" ty:key="*this">
-      <block ty:if="{{i.nodes[item].props['slot']}}">
-        <view
-          slot="{{i.nodes[item].props['slot']}}"
-        <%_ for(let i=0;i < slotView.props.length; i++) { -%>
-          <%=slotView.props[i]%>="{{i.nodes[item].props['<%=slotView.props[i]%>']}}"
-        <%_ } -%>
-        >
+  <%_ } else { -%>
+    <<%=id%>
+    <%_ for(let i=0;i < props.length; i++) { -%>
+      <%=props[i]%>="{{i.props['<%=props[i]%>']}}"
+    <%_ } -%>
+    >
+      <%_ if (id === 'swiper') { -%>
+      <block ty:for="{{i.children}}" ty:key="*this">
+        <swiper-item key="{{i.nodes[item].props.key}}">
           <block ty:for="{{i.nodes[item].children}}" ty:key="*this" ty:for-item="sItem">
             <template is="{{'REMAX_TPL_' + i.nodes[item].nodes[sItem].type}}" data="{{i: i.nodes[item].nodes[sItem]}}" />
           </block>
-        </view>
+        </swiper-item>
+      </block>
+      <%_ } else if (id === 'picker-view') { -%>
+      <block ty:for="{{i.children}}" ty:key="*this">
+        <picker-view-column>
+          <block ty:for="{{i.nodes[item].children}}" ty:for-item="sItem">
+            <template is="{{'REMAX_TPL_' + i.nodes[item].nodes[sItem].type}}" data="{{i: i.nodes[item].nodes[sItem]}}" />
+          </block>
+        </picker-view-column>
+      </block>
+      <%_ } else if (type === 'native') { -%>
+      <block ty:for="{{i.children}}" ty:key="*this">
+        <block ty:if="{{i.nodes[item].props['slot']}}">
+          <view
+            slot="{{i.nodes[item].props['slot']}}"
+          <%_ for(let i=0;i < slotView.props.length; i++) { -%>
+            <%=slotView.props[i]%>="{{i.nodes[item].props['<%=slotView.props[i]%>']}}"
+          <%_ } -%>
+          >
+            <block ty:for="{{i.nodes[item].children}}" ty:key="*this" ty:for-item="sItem">
+              <template is="{{'REMAX_TPL_' + i.nodes[item].nodes[sItem].type}}" data="{{i: i.nodes[item].nodes[sItem]}}" />
+            </block>
+          </view>
+        </block>
+        <block ty:else>
+          <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
+        </block>
       </block>
-      <block ty:else>
+      <%_ } else { -%>
+      <block ty:for="{{i.children}}" ty:key="*this">
         <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
       </block>
-    </block>
-    <%_ } else { -%>
-    <block ty:for="{{i.children}}" ty:key="*this">
-      <template is="{{'REMAX_TPL_' + i.nodes[item].type}}" data="{{i: i.nodes[item]}}" />
-    </block>
-    <%_ } -%>
-  </<%=id%>>
+      <%_ } -%>
+    </<%=id%>>
+  <% } %>
 </template>