fix(ali): 组件 ScrollView 增加 disableLowerScroll 和 disableLowerScroll 属性

remaxjs · Mar 16, 2021 · c5d5ee3 · c5d5ee3 · vercel · Mar 16, 2021
1 parent d989e9e
commit c5d5ee3
Show file tree

Hide file tree

Showing 71 changed files with 142 additions and 0 deletions.
diff --git a/packages/remax-ali/src/hostComponents/ScrollView/index.ts b/packages/remax-ali/src/hostComponents/ScrollView/index.ts
@@ -17,6 +17,8 @@ export interface ScrollViewProps {
  scrollAnimationDuration?: number;
  enableBackToTop?: boolean;
  trapScroll?: boolean;
+ disableLowerScroll?: 'always' | 'out-of-bounds';
+ disableUpperScroll?: 'always' | 'out-of-bounds';
  onScrollToUpper?: (e: any) => void;
  onScrollToLower?: (e: any) => void;
  onScroll?: (e: any) => void;

diff --git a/packages/remax-ali/src/hostComponents/ScrollView/node.ts b/packages/remax-ali/src/hostComponents/ScrollView/node.ts
@@ -16,6 +16,8 @@ export const alias = {
  enableBackToTop: 'enable-back-to-top',
  trapScroll: 'trap-scroll',
  onScrollToUpper: 'onScrollToUpper',
+ disableLowerScroll: 'disable-lower-scroll',
+ disableUpperScroll: 'disable-upper-scroll',
  onScrollToLower: 'onScrollToLower',
  onScroll: 'onScroll',
  onTouchStart: 'onTouchStart',

diff --git a/...es/remax-cli/src/__tests__/integration/fixtures/ali/expected/__remax_runtime_options__.js b/...es/remax-cli/src/__tests__/integration/fixtures/ali/expected/__remax_runtime_options__.js
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.axml b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.axml
diff --git a/...remax-cli/src/__tests__/integration/fixtures/assets/expected/__remax_runtime_options__.js b/...remax-cli/src/__tests__/integration/fixtures/assets/expected/__remax_runtime_options__.js
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/assets/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/assets/expected/pages/index.axml
diff --git a/.../__tests__/integration/fixtures/babel-plugin-import/expected/__remax_runtime_options__.js b/.../__tests__/integration/fixtures/babel-plugin-import/expected/__remax_runtime_options__.js
diff --git a/...emax-cli/src/__tests__/integration/fixtures/babel-plugin-import/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/babel-plugin-import/expected/pages/index.axml
diff --git a/...emax-cli/src/__tests__/integration/fixtures/babelrc/expected/__remax_runtime_options__.js b/...emax-cli/src/__tests__/integration/fixtures/babelrc/expected/__remax_runtime_options__.js
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/babelrc/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/babelrc/expected/pages/index.axml
diff --git a/...c/__tests__/integration/fixtures/circularDependence/expected/__remax_runtime_options__.js b/...c/__tests__/integration/fixtures/circularDependence/expected/__remax_runtime_options__.js
diff --git a/...remax-cli/src/__tests__/integration/fixtures/circularDependence/expected/pages/index.axml b/...remax-cli/src/__tests__/integration/fixtures/circularDependence/expected/pages/index.axml
diff --git a/.../__tests__/integration/fixtures/component-recursion/expected/__remax_runtime_options__.js b/.../__tests__/integration/fixtures/component-recursion/expected/__remax_runtime_options__.js
diff --git a/...emax-cli/src/__tests__/integration/fixtures/component-recursion/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/component-recursion/expected/pages/index.axml
diff --git a/.../__tests__/integration/fixtures/config-add-css-rule/expected/__remax_runtime_options__.js b/.../__tests__/integration/fixtures/config-add-css-rule/expected/__remax_runtime_options__.js
diff --git a/...emax-cli/src/__tests__/integration/fixtures/config-add-css-rule/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/config-add-css-rule/expected/pages/index.axml
diff --git a/.../__tests__/integration/fixtures/createHostComponent/expected/__remax_runtime_options__.js b/.../__tests__/integration/fixtures/createHostComponent/expected/__remax_runtime_options__.js
diff --git a/...emax-cli/src/__tests__/integration/fixtures/createHostComponent/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/createHostComponent/expected/pages/index.axml
diff --git a/...i/src/__tests__/integration/fixtures/customCwdBabel/expected/__remax_runtime_options__.js b/...i/src/__tests__/integration/fixtures/customCwdBabel/expected/__remax_runtime_options__.js
diff --git a/...ges/remax-cli/src/__tests__/integration/fixtures/customCwdBabel/expected/pages/index.axml b/...ges/remax-cli/src/__tests__/integration/fixtures/customCwdBabel/expected/pages/index.axml
diff --git a/...li/src/__tests__/integration/fixtures/customRootDir/expected/__remax_runtime_options__.js b/...li/src/__tests__/integration/fixtures/customRootDir/expected/__remax_runtime_options__.js
diff --git a/...ages/remax-cli/src/__tests__/integration/fixtures/customRootDir/expected/pages/index.axml b/...ages/remax-cli/src/__tests__/integration/fixtures/customRootDir/expected/pages/index.axml
diff --git a/...es/remax-cli/src/__tests__/integration/fixtures/env/expected/__remax_runtime_options__.js b/...es/remax-cli/src/__tests__/integration/fixtures/env/expected/__remax_runtime_options__.js
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/env/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/env/expected/pages/index.axml
diff --git a/...rc/__tests__/integration/fixtures/hook-config-babel/expected/__remax_runtime_options__.js b/...rc/__tests__/integration/fixtures/hook-config-babel/expected/__remax_runtime_options__.js
diff --git a/.../remax-cli/src/__tests__/integration/fixtures/hook-config-babel/expected/pages/index.axml b/.../remax-cli/src/__tests__/integration/fixtures/hook-config-babel/expected/pages/index.axml
diff --git a/.../__tests__/integration/fixtures/hook-config-webpack/expected/__remax_runtime_options__.js b/.../__tests__/integration/fixtures/hook-config-webpack/expected/__remax_runtime_options__.js
diff --git a/...emax-cli/src/__tests__/integration/fixtures/hook-config-webpack/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/hook-config-webpack/expected/pages/index.axml
diff --git a/...c/__tests__/integration/fixtures/hook-on-app-config/expected/__remax_runtime_options__.js b/...c/__tests__/integration/fixtures/hook-on-app-config/expected/__remax_runtime_options__.js
diff --git a/...remax-cli/src/__tests__/integration/fixtures/hook-on-app-config/expected/pages/index.axml b/...remax-cli/src/__tests__/integration/fixtures/hook-on-app-config/expected/pages/index.axml
diff --git a/.../__tests__/integration/fixtures/hook-on-page-config/expected/__remax_runtime_options__.js b/.../__tests__/integration/fixtures/hook-on-page-config/expected/__remax_runtime_options__.js
diff --git a/...emax-cli/src/__tests__/integration/fixtures/hook-on-page-config/expected/pages/about.axml b/...emax-cli/src/__tests__/integration/fixtures/hook-on-page-config/expected/pages/about.axml
diff --git a/...emax-cli/src/__tests__/integration/fixtures/hook-on-page-config/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/hook-on-page-config/expected/pages/index.axml
diff --git a/..._tests__/integration/fixtures/hook-on-page-template/expected/__remax_runtime_options__.js b/..._tests__/integration/fixtures/hook-on-page-template/expected/__remax_runtime_options__.js
diff --git a/...ax-cli/src/__tests__/integration/fixtures/hook-on-page-template/expected/pages/about.axml b/...ax-cli/src/__tests__/integration/fixtures/hook-on-page-template/expected/pages/about.axml
diff --git a/...ax-cli/src/__tests__/integration/fixtures/hook-on-page-template/expected/pages/index.axml b/...ax-cli/src/__tests__/integration/fixtures/hook-on-page-template/expected/pages/index.axml
diff --git a/...x-cli/src/__tests__/integration/fixtures/hybrid-app/expected/__remax_runtime_options__.js b/...x-cli/src/__tests__/integration/fixtures/hybrid-app/expected/__remax_runtime_options__.js
diff --git a/...s/remax-cli/src/__tests__/integration/fixtures/hybrid-app/expected/pages/react/index.axml b/...s/remax-cli/src/__tests__/integration/fixtures/hybrid-app/expected/pages/react/index.axml
diff --git a/...c/__tests__/integration/fixtures/hybrid-mini-plugin/expected/__remax_runtime_options__.js b/...c/__tests__/integration/fixtures/hybrid-mini-plugin/expected/__remax_runtime_options__.js
diff --git a/...ests__/integration/fixtures/hybrid-mini-plugin/expected/components/react-greet/index.axml b/...ests__/integration/fixtures/hybrid-mini-plugin/expected/components/react-greet/index.axml
diff --git a/...cli/src/__tests__/integration/fixtures/hybrid-mini-plugin/expected/pages/react/index.axml b/...cli/src/__tests__/integration/fixtures/hybrid-mini-plugin/expected/pages/react/index.axml
diff --git a/...ax-cli/src/__tests__/integration/fixtures/lifeCycle/expected/__remax_runtime_options__.js b/...ax-cli/src/__tests__/integration/fixtures/lifeCycle/expected/__remax_runtime_options__.js