Merge remote-tracking branch 'origin/next' into chore/mini-program

NervJS · Jan 28, 2021 · e61b204 · e61b204
2 parents c3e1a5f + 1b1af45
commit e61b204
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 50 deletions.
diff --git a/packages/taro-components/__tests__/unimplemented.spec.js b/packages/taro-components/__tests__/unimplemented.spec.js
@@ -3,8 +3,8 @@ import ReactDOM from 'react-dom'
 import {
   CoverImage,
   CoverView,
-  MoveableArea,
-  MoveableView,
+  MovableArea,
+  MovableView,
   PickerView,
   PickerViewColumn,
   OpenData,
@@ -89,12 +89,12 @@ describe('unimplemented', () => {
     await testComponent(CoverImage)
   })
 
-  it('MoveableArea', async () => {
-    await testComponent(MoveableArea)
+  it('MovableArea', async () => {
+    await testComponent(MovableArea)
   })
 
-  it('MoveableView', async () => {
-    await testComponent(MoveableView)
+  it('MovableView', async () => {
+    await testComponent(MovableView)
   })
 
   it('PickerViewColumn', async () => {

diff --git a/packages/taro-components/h5/react/index.js b/packages/taro-components/h5/react/index.js
@@ -23,8 +23,8 @@ export const Switch = reactifyWc('taro-switch-core')
 export const CoverImage = reactifyWc('taro-cover-image-core')
 export const Textarea = reactifyWc('taro-textarea-core')
 export const CoverView = reactifyWc('taro-cover-view-core')
-export const MoveableArea = reactifyWc('taro-moveable-area-core')
-export const MoveableView = reactifyWc('taro-moveable-view-core')
+export const MovableArea = reactifyWc('taro-movable-area-core')
+export const MovableView = reactifyWc('taro-movable-view-core')
 export const ScrollView = reactifyWc('taro-scroll-view-core')
 export const Swiper = reactifyWc('taro-swiper-core')
 export const SwiperItem = reactifyWc('taro-swiper-item-core')

diff --git a/packages/taro-components/src/components.d.ts b/packages/taro-components/src/components.d.ts
@@ -89,8 +89,8 @@ export namespace Components {
   interface TaroLabelCore {
     'for': string;
   }
-  interface TaroMoveableAreaCore {}
-  interface TaroMoveableViewCore {}
+  interface TaroMovableAreaCore {}
+  interface TaroMovableViewCore {}
   interface TaroNavigatorCore {
     'delta': number;
     'hoverClass': string;
@@ -485,16 +485,16 @@ declare global {
     new (): HTMLTaroLabelCoreElement;
   };
 
-  interface HTMLTaroMoveableAreaCoreElement extends Components.TaroMoveableAreaCore, HTMLStencilElement {}
-  var HTMLTaroMoveableAreaCoreElement: {
-    prototype: HTMLTaroMoveableAreaCoreElement;
-    new (): HTMLTaroMoveableAreaCoreElement;
+  interface HTMLTaroMovableAreaCoreElement extends Components.TaroMovableAreaCore, HTMLStencilElement {}
+  var HTMLTaroMovableAreaCoreElement: {
+    prototype: HTMLTaroMovableAreaCoreElement;
+    new (): HTMLTaroMovableAreaCoreElement;
   };
 
-  interface HTMLTaroMoveableViewCoreElement extends Components.TaroMoveableViewCore, HTMLStencilElement {}
-  var HTMLTaroMoveableViewCoreElement: {
-    prototype: HTMLTaroMoveableViewCoreElement;
-    new (): HTMLTaroMoveableViewCoreElement;
+  interface HTMLTaroMovableViewCoreElement extends Components.TaroMovableViewCore, HTMLStencilElement {}
+  var HTMLTaroMovableViewCoreElement: {
+    prototype: HTMLTaroMovableViewCoreElement;
+    new (): HTMLTaroMovableViewCoreElement;
   };
 
   interface HTMLTaroNavigatorCoreElement extends Components.TaroNavigatorCore, HTMLStencilElement {}
@@ -656,8 +656,8 @@ declare global {
     'taro-image-core': HTMLTaroImageCoreElement;
     'taro-input-core': HTMLTaroInputCoreElement;
     'taro-label-core': HTMLTaroLabelCoreElement;
-    'taro-moveable-area-core': HTMLTaroMoveableAreaCoreElement;
-    'taro-moveable-view-core': HTMLTaroMoveableViewCoreElement;
+    'taro-movable-area-core': HTMLTaroMovableAreaCoreElement;
+    'taro-movable-view-core': HTMLTaroMovableViewCoreElement;
     'taro-navigator-core': HTMLTaroNavigatorCoreElement;
     'taro-open-data-core': HTMLTaroOpenDataCoreElement;
     'taro-picker-core': HTMLTaroPickerCoreElement;
@@ -767,8 +767,8 @@ declare namespace LocalJSX {
   interface TaroLabelCore {
     'for'?: string;
   }
-  interface TaroMoveableAreaCore {}
-  interface TaroMoveableViewCore {}
+  interface TaroMovableAreaCore {}
+  interface TaroMovableViewCore {}
   interface TaroNavigatorCore {
     'delta'?: number;
     'hoverClass'?: string;
@@ -1088,8 +1088,8 @@ declare namespace LocalJSX {
     'taro-image-core': TaroImageCore;
     'taro-input-core': TaroInputCore;
     'taro-label-core': TaroLabelCore;
-    'taro-moveable-area-core': TaroMoveableAreaCore;
-    'taro-moveable-view-core': TaroMoveableViewCore;
+    'taro-movable-area-core': TaroMovableAreaCore;
+    'taro-movable-view-core': TaroMovableViewCore;
     'taro-navigator-core': TaroNavigatorCore;
     'taro-open-data-core': TaroOpenDataCore;
     'taro-picker-core': TaroPickerCore;
@@ -1138,8 +1138,8 @@ declare module "@stencil/core" {
       'taro-image-core': LocalJSX.TaroImageCore & JSXBase.HTMLAttributes<HTMLTaroImageCoreElement>;
       'taro-input-core': LocalJSX.TaroInputCore & JSXBase.HTMLAttributes<HTMLTaroInputCoreElement>;
       'taro-label-core': LocalJSX.TaroLabelCore & JSXBase.HTMLAttributes<HTMLTaroLabelCoreElement>;
-      'taro-moveable-area-core': LocalJSX.TaroMoveableAreaCore & JSXBase.HTMLAttributes<HTMLTaroMoveableAreaCoreElement>;
-      'taro-moveable-view-core': LocalJSX.TaroMoveableViewCore & JSXBase.HTMLAttributes<HTMLTaroMoveableViewCoreElement>;
+      'taro-movable-area-core': LocalJSX.TaroMovableAreaCore & JSXBase.HTMLAttributes<HTMLTaroMovableAreaCoreElement>;
+      'taro-movable-view-core': LocalJSX.TaroMovableViewCore & JSXBase.HTMLAttributes<HTMLTaroMovableViewCoreElement>;
       'taro-navigator-core': LocalJSX.TaroNavigatorCore & JSXBase.HTMLAttributes<HTMLTaroNavigatorCoreElement>;
       'taro-open-data-core': LocalJSX.TaroOpenDataCore & JSXBase.HTMLAttributes<HTMLTaroOpenDataCoreElement>;
       'taro-picker-core': LocalJSX.TaroPickerCore & JSXBase.HTMLAttributes<HTMLTaroPickerCoreElement>;

diff --git a/...components/movable-view/moveable-area.tsx → .../components/movable-view/movable-area.tsx b/...components/movable-view/moveable-area.tsx → .../components/movable-view/movable-area.tsx
@@ -2,11 +2,11 @@
 import { Component, h, Host } from '@stencil/core'
 
 @Component({
-  tag: 'taro-moveable-area-core'
+  tag: 'taro-movable-area-core'
 })
-export class MoveableArea {
+export class MovableArea {
   componentDidLoad () {
-    console.error('H5 暂不支持 MoveableArea 组件！')
+    console.error('H5 暂不支持 MovableArea 组件！')
   }
 
   render () {

diff --git a/...components/movable-view/moveable-view.tsx → .../components/movable-view/movable-view.tsx b/...components/movable-view/moveable-view.tsx → .../components/movable-view/movable-view.tsx
@@ -2,11 +2,11 @@
 import { Component, h, Host } from '@stencil/core'
 
 @Component({
-  tag: 'taro-moveable-view-core'
+  tag: 'taro-movable-view-core'
 })
-export class MoveableView {
+export class MovableView {
   componentDidLoad () {
-    console.error('H5 暂不支持 MoveableView 组件！')
+    console.error('H5 暂不支持 MovableView 组件！')
   }
 
   render () {

diff --git a/packages/taro-components/types/components.d.ts b/packages/taro-components/types/components.d.ts
@@ -89,8 +89,8 @@ export namespace Components {
   interface TaroLabelCore {
     'for': string;
   }
-  interface TaroMoveableAreaCore {}
-  interface TaroMoveableViewCore {}
+  interface TaroMovableAreaCore {}
+  interface TaroMovableViewCore {}
   interface TaroNavigatorCore {
     'delta': number;
     'hoverClass': string;
@@ -485,16 +485,16 @@ declare global {
     new (): HTMLTaroLabelCoreElement;
   };
 
-  interface HTMLTaroMoveableAreaCoreElement extends Components.TaroMoveableAreaCore, HTMLStencilElement {}
-  var HTMLTaroMoveableAreaCoreElement: {
-    prototype: HTMLTaroMoveableAreaCoreElement;
-    new (): HTMLTaroMoveableAreaCoreElement;
+  interface HTMLTaroMovableAreaCoreElement extends Components.TaroMovableAreaCore, HTMLStencilElement {}
+  var HTMLTaroMovableAreaCoreElement: {
+    prototype: HTMLTaroMovableAreaCoreElement;
+    new (): HTMLTaroMovableAreaCoreElement;
   };
 
-  interface HTMLTaroMoveableViewCoreElement extends Components.TaroMoveableViewCore, HTMLStencilElement {}
-  var HTMLTaroMoveableViewCoreElement: {
-    prototype: HTMLTaroMoveableViewCoreElement;
-    new (): HTMLTaroMoveableViewCoreElement;
+  interface HTMLTaroMovableViewCoreElement extends Components.TaroMovableViewCore, HTMLStencilElement {}
+  var HTMLTaroMovableViewCoreElement: {
+    prototype: HTMLTaroMovableViewCoreElement;
+    new (): HTMLTaroMovableViewCoreElement;
   };
 
   interface HTMLTaroNavigatorCoreElement extends Components.TaroNavigatorCore, HTMLStencilElement {}
@@ -656,8 +656,8 @@ declare global {
     'taro-image-core': HTMLTaroImageCoreElement;
     'taro-input-core': HTMLTaroInputCoreElement;
     'taro-label-core': HTMLTaroLabelCoreElement;
-    'taro-moveable-area-core': HTMLTaroMoveableAreaCoreElement;
-    'taro-moveable-view-core': HTMLTaroMoveableViewCoreElement;
+    'taro-movable-area-core': HTMLTaroMovableAreaCoreElement;
+    'taro-movable-view-core': HTMLTaroMovableViewCoreElement;
     'taro-navigator-core': HTMLTaroNavigatorCoreElement;
     'taro-open-data-core': HTMLTaroOpenDataCoreElement;
     'taro-picker-core': HTMLTaroPickerCoreElement;
@@ -767,8 +767,8 @@ declare namespace LocalJSX {
   interface TaroLabelCore {
     'for'?: string;
   }
-  interface TaroMoveableAreaCore {}
-  interface TaroMoveableViewCore {}
+  interface TaroMovableAreaCore {}
+  interface TaroMovableViewCore {}
   interface TaroNavigatorCore {
     'delta'?: number;
     'hoverClass'?: string;
@@ -1088,8 +1088,8 @@ declare namespace LocalJSX {
     'taro-image-core': TaroImageCore;
     'taro-input-core': TaroInputCore;
     'taro-label-core': TaroLabelCore;
-    'taro-moveable-area-core': TaroMoveableAreaCore;
-    'taro-moveable-view-core': TaroMoveableViewCore;
+    'taro-movable-area-core': TaroMovableAreaCore;
+    'taro-movable-view-core': TaroMovableViewCore;
     'taro-navigator-core': TaroNavigatorCore;
     'taro-open-data-core': TaroOpenDataCore;
     'taro-picker-core': TaroPickerCore;
@@ -1138,8 +1138,8 @@ declare module "@stencil/core" {
       'taro-image-core': LocalJSX.TaroImageCore & JSXBase.HTMLAttributes<HTMLTaroImageCoreElement>;
       'taro-input-core': LocalJSX.TaroInputCore & JSXBase.HTMLAttributes<HTMLTaroInputCoreElement>;
       'taro-label-core': LocalJSX.TaroLabelCore & JSXBase.HTMLAttributes<HTMLTaroLabelCoreElement>;
-      'taro-moveable-area-core': LocalJSX.TaroMoveableAreaCore & JSXBase.HTMLAttributes<HTMLTaroMoveableAreaCoreElement>;
-      'taro-moveable-view-core': LocalJSX.TaroMoveableViewCore & JSXBase.HTMLAttributes<HTMLTaroMoveableViewCoreElement>;
+      'taro-movable-area-core': LocalJSX.TaroMovableAreaCore & JSXBase.HTMLAttributes<HTMLTaroMovableAreaCoreElement>;
+      'taro-movable-view-core': LocalJSX.TaroMovableViewCore & JSXBase.HTMLAttributes<HTMLTaroMovableViewCoreElement>;
       'taro-navigator-core': LocalJSX.TaroNavigatorCore & JSXBase.HTMLAttributes<HTMLTaroNavigatorCoreElement>;
       'taro-open-data-core': LocalJSX.TaroOpenDataCore & JSXBase.HTMLAttributes<HTMLTaroOpenDataCoreElement>;
       'taro-picker-core': LocalJSX.TaroPickerCore & JSXBase.HTMLAttributes<HTMLTaroPickerCoreElement>;