@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.2 → 4.0.0-alpha.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/apis/base/system.ts +73 -20
- package/dist/apis/canvas/index.ts +10 -1
- package/dist/apis/device/clipboard.ts +16 -8
- package/dist/apis/framework/index.ts +1 -5
- package/dist/apis/index.ts +25 -17
- package/dist/apis/media/image/index.ts +1 -1
- package/dist/apis/storage/index.ts +146 -78
- package/dist/apis/ui/animation/animation.ts +71 -29
- package/dist/apis/ui/background.ts +2 -1
- package/dist/apis/ui/interaction/index.ts +42 -59
- package/dist/apis/ui/navigation-bar/index.ts +1 -1
- package/dist/apis/ui/pull-down-refresh.ts +9 -3
- package/dist/apis/ui/scroll/index.ts +5 -5
- package/dist/apis/ui/tab-bar.ts +3 -3
- package/dist/apis/utils/index.ts +2 -1
- package/dist/apis/wxml/IntersectionObserver.ts +18 -10
- package/dist/apis/wxml/selectorQuery.ts +26 -13
- package/dist/components-harmony-ets/button.ets +64 -34
- package/dist/components-harmony-ets/canvas.ets +51 -0
- package/dist/components-harmony-ets/checkbox.ets +72 -61
- package/dist/components-harmony-ets/form.ets +51 -29
- package/dist/components-harmony-ets/icon.ets +31 -19
- package/dist/components-harmony-ets/image.ets +34 -14
- package/dist/components-harmony-ets/index.ets +92 -0
- package/dist/components-harmony-ets/innerHtml.ets +11 -6
- package/dist/components-harmony-ets/input.ets +49 -41
- package/dist/components-harmony-ets/label.ets +71 -44
- package/dist/components-harmony-ets/listView.ets +26 -0
- package/dist/components-harmony-ets/movableArea.ets +126 -0
- package/dist/components-harmony-ets/movableView.ets +93 -0
- package/dist/components-harmony-ets/navigationBar.ets +65 -0
- package/dist/components-harmony-ets/pageMeta.ets +94 -0
- package/dist/components-harmony-ets/picker.ets +42 -38
- package/dist/components-harmony-ets/progress.ets +52 -0
- package/dist/components-harmony-ets/pseudo.ets +80 -0
- package/dist/components-harmony-ets/radio.ets +74 -64
- package/dist/components-harmony-ets/richText.ets +14 -30
- package/dist/components-harmony-ets/scrollList.ets +94 -0
- package/dist/components-harmony-ets/scrollView.ets +61 -57
- package/dist/components-harmony-ets/slider.ets +18 -14
- package/dist/components-harmony-ets/stickySection.ets +42 -0
- package/dist/components-harmony-ets/style.ets +381 -130
- package/dist/components-harmony-ets/swiper.ets +61 -20
- package/dist/components-harmony-ets/switch.ets +36 -32
- package/dist/components-harmony-ets/{index.ts → tag.ts} +6 -0
- package/dist/components-harmony-ets/text.ets +135 -49
- package/dist/components-harmony-ets/textArea.ets +50 -35
- package/dist/components-harmony-ets/utils/AttributeManager.ets +1 -1
- package/dist/components-harmony-ets/utils/DynamicCenter.ts +2 -2
- package/dist/components-harmony-ets/utils/flexManager.ets +49 -19
- package/dist/components-harmony-ets/utils/helper.ets +18 -5
- package/dist/components-harmony-ets/utils/htmlParser/HarmonyHTMLParser.ts +1 -2
- package/dist/components-harmony-ets/utils/htmlParser/index.ts +1 -1
- package/dist/components-harmony-ets/utils/index.ts +54 -50
- package/dist/components-harmony-ets/utils/styles.ets +170 -93
- package/dist/components-harmony-ets/video.ets +34 -21
- package/dist/components-harmony-ets/view.ets +63 -52
- package/dist/components-harmony-ets/webView.ets +40 -34
- package/dist/index.d.ts +152 -0
- package/dist/index.js +99 -55
- package/dist/index.js.map +1 -1
- package/dist/runtime-ets/bom/document.ts +6 -4
- package/dist/runtime-ets/bom/getComputedStyle.ts +2 -2
- package/dist/runtime-ets/bom/window.ts +7 -0
- package/dist/runtime-ets/current.ts +3 -0
- package/dist/runtime-ets/dom/bind.ts +28 -12
- package/dist/runtime-ets/dom/class-list.ts +2 -2
- package/dist/runtime-ets/dom/cssNesting.ts +419 -0
- package/dist/runtime-ets/dom/cssStyleDeclaration.ts +28 -42
- package/dist/runtime-ets/dom/document.ts +8 -11
- package/dist/runtime-ets/dom/element/canvas.ts +136 -0
- package/dist/runtime-ets/dom/element/element.ts +348 -57
- package/dist/runtime-ets/dom/element/form.ts +31 -26
- package/dist/runtime-ets/dom/element/index.ts +30 -2
- package/dist/runtime-ets/dom/element/movableArea.ts +11 -0
- package/dist/runtime-ets/dom/element/movableView.ts +244 -0
- package/dist/runtime-ets/dom/element/normal.ts +35 -8
- package/dist/runtime-ets/dom/element/progress.ts +11 -0
- package/dist/runtime-ets/dom/element/scrollView.ts +1 -0
- package/dist/runtime-ets/dom/element/text.ts +1 -8
- package/dist/runtime-ets/dom/element/video.ts +5 -4
- package/dist/runtime-ets/dom/element/webView.ts +12 -5
- package/dist/runtime-ets/dom/event.ts +2 -4
- package/dist/runtime-ets/dom/eventTarget.ts +2 -3
- package/dist/runtime-ets/dom/node.ts +54 -29
- package/dist/runtime-ets/dom/stylesheet/covertWeb2Hm.ts +416 -235
- package/dist/runtime-ets/dom/stylesheet/index.ts +29 -311
- package/dist/runtime-ets/dom/stylesheet/type.ts +51 -9
- package/dist/runtime-ets/dom/stylesheet/util.ts +33 -27
- package/dist/runtime-ets/index.ts +2 -1
- package/dist/runtime-ets/interface/event.ts +1 -1
- package/dist/runtime-ets/utils/index.ts +73 -13
- package/dist/runtime-ets/utils/info.ts +2 -2
- package/dist/runtime-framework/react/app.ts +9 -4
- package/dist/runtime-framework/react/hooks.ts +0 -1
- package/dist/runtime-framework/react/index.ts +0 -2
- package/dist/runtime-framework/react/native-page.ts +154 -77
- package/dist/runtime-framework/react/page.ts +3 -8
- package/dist/runtime-framework/solid/app.ts +25 -45
- package/dist/runtime-framework/solid/connect.ts +21 -3
- package/dist/runtime-framework/solid/hooks.ts +16 -11
- package/dist/runtime-framework/solid/index.ts +6 -2
- package/dist/runtime-framework/solid/page.ts +84 -30
- package/dist/runtime-framework/solid/reconciler/props.ts +70 -25
- package/dist/runtime-framework/solid/reconciler/render.ts +16 -6
- package/dist/runtime-framework/solid/reconciler/use.ts +0 -1
- package/dist/runtime-framework/solid/utils/index.ts +0 -2
- package/dist/runtime-utils.d.ts +827 -0
- package/dist/runtime-utils.js +435 -218
- package/dist/runtime-utils.js.map +1 -1
- package/dist/runtime.d.ts +1 -0
- package/dist/runtime.js +435 -218
- package/dist/runtime.js.map +1 -1
- package/index.js +3 -1
- package/package.json +14 -15
- package/static/media/cancel.svg +1 -1
- package/static/media/circle.svg +1 -1
- package/static/media/clear.svg +1 -1
- package/static/media/download.svg +1 -1
- package/static/media/info.svg +1 -1
- package/static/media/info_circle.svg +1 -1
- package/static/media/search.svg +1 -1
- package/static/media/success.svg +1 -1
- package/static/media/success_no_circle.svg +1 -1
- package/static/media/warn.svg +1 -1
- package/types/harmony.d.ts +4 -0
- package/types/index.d.ts +4 -0
- package/types/runtime.d.ts +1 -1
- /package/dist/runtime-framework/solid/{contant.ts → constant.ts} +0 -0
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import TaroImage, { getImageMode } from './image'
|
|
2
|
+
import TaroText from './text'
|
|
3
|
+
import TaroView from './view'
|
|
4
|
+
import TaroIcon from './icon'
|
|
5
|
+
import TaroForm from './form'
|
|
6
|
+
import TaroLabel from './label'
|
|
7
|
+
import TaroInput from './input'
|
|
8
|
+
import TaroVideo from './video'
|
|
9
|
+
import TaroCanvas from './canvas'
|
|
10
|
+
import TaroButton from './button'
|
|
11
|
+
import TaroPicker from './picker'
|
|
12
|
+
import TaroSlider from './slider'
|
|
13
|
+
import TaroSwitch from './switch'
|
|
14
|
+
import TaroSwiper from './swiper'
|
|
15
|
+
import TaroWebView from './webView'
|
|
16
|
+
import TaroTextArea from './textArea'
|
|
17
|
+
import TaroRichText from './richText'
|
|
18
|
+
import TaroProgress from './progress'
|
|
19
|
+
import TaroInnerHtml from './innerHtml'
|
|
20
|
+
import TaroScrollView from './scrollView'
|
|
21
|
+
import TaroMovableArea from './movableArea'
|
|
22
|
+
import TaroMovableView from './movableView'
|
|
23
|
+
import { TaroRadio, TaroRadioGroup } from './radio'
|
|
24
|
+
import { TaroCheckboxGroup, TaroCheckbox } from './checkbox'
|
|
25
|
+
import TaroPageMeta from './pageMeta'
|
|
26
|
+
import TaroNavigationBar from './navigationBar'
|
|
27
|
+
|
|
28
|
+
import TaroListView from './listView'
|
|
29
|
+
import TaroStickySection from './stickySection'
|
|
30
|
+
import TaroScrollList from './scrollList'
|
|
31
|
+
|
|
32
|
+
import commonStyleModify, { rowModify, columnModify, textModify, setNormalTextAttributeIntoInstance } from './style'
|
|
33
|
+
import { getButtonColor } from './button'
|
|
34
|
+
import { FlexManager } from './utils/flexManager'
|
|
35
|
+
import { DynamicCenter } from './utils/DynamicCenter'
|
|
36
|
+
import { TOUCH_EVENT_MAP } from './utils/constant/event'
|
|
37
|
+
import { BUTTON_THEME_COLOR } from './utils/constant/style'
|
|
38
|
+
import { getStyleAttr } from './utils/styles'
|
|
39
|
+
import { shouldBindEvent, getNodeThresholds, getNormalAttributes, getFontAttributes } from './utils/helper'
|
|
40
|
+
|
|
41
|
+
export {
|
|
42
|
+
textModify,
|
|
43
|
+
getStyleAttr,
|
|
44
|
+
FlexManager,
|
|
45
|
+
DynamicCenter,
|
|
46
|
+
getButtonColor,
|
|
47
|
+
TOUCH_EVENT_MAP,
|
|
48
|
+
shouldBindEvent,
|
|
49
|
+
getFontAttributes,
|
|
50
|
+
commonStyleModify,
|
|
51
|
+
rowModify,
|
|
52
|
+
columnModify,
|
|
53
|
+
getNodeThresholds,
|
|
54
|
+
BUTTON_THEME_COLOR,
|
|
55
|
+
getNormalAttributes,
|
|
56
|
+
setNormalTextAttributeIntoInstance,
|
|
57
|
+
getImageMode,
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export {
|
|
61
|
+
TaroImage,
|
|
62
|
+
TaroCanvas,
|
|
63
|
+
TaroText,
|
|
64
|
+
TaroView,
|
|
65
|
+
TaroIcon,
|
|
66
|
+
TaroForm,
|
|
67
|
+
TaroLabel,
|
|
68
|
+
TaroInput,
|
|
69
|
+
TaroVideo,
|
|
70
|
+
TaroButton,
|
|
71
|
+
TaroPicker,
|
|
72
|
+
TaroSlider,
|
|
73
|
+
TaroSwitch,
|
|
74
|
+
TaroSwiper,
|
|
75
|
+
TaroWebView,
|
|
76
|
+
TaroTextArea,
|
|
77
|
+
TaroRichText,
|
|
78
|
+
TaroProgress,
|
|
79
|
+
TaroInnerHtml,
|
|
80
|
+
TaroScrollView,
|
|
81
|
+
TaroMovableArea,
|
|
82
|
+
TaroMovableView,
|
|
83
|
+
TaroRadio,
|
|
84
|
+
TaroRadioGroup,
|
|
85
|
+
TaroCheckboxGroup,
|
|
86
|
+
TaroCheckbox,
|
|
87
|
+
TaroPageMeta,
|
|
88
|
+
TaroNavigationBar,
|
|
89
|
+
TaroListView,
|
|
90
|
+
TaroStickySection,
|
|
91
|
+
TaroScrollList
|
|
92
|
+
}
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import htmlParser from './utils/htmlParser'
|
|
2
|
-
import { createChildItem } from './render'
|
|
3
2
|
|
|
4
|
-
import type { TaroElement } from '@tarojs/runtime'
|
|
3
|
+
import type { TaroElement, TaroInnerHtmlElement } from '@tarojs/runtime'
|
|
5
4
|
|
|
6
|
-
@
|
|
7
|
-
export default
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
@Component
|
|
6
|
+
export default struct TaroInnerHtml {
|
|
7
|
+
@Builder customBuilder() {}
|
|
8
|
+
@BuilderParam createChildItem: (node: TaroElement, callback?: (node: TaroElement) => void) => void = this.customBuilder
|
|
9
|
+
@ObjectLink node: TaroInnerHtmlElement
|
|
10
|
+
|
|
11
|
+
build() {
|
|
12
|
+
if (this.node?.hmStyle?.display !== 'none' && this.node.innerHTML) {
|
|
13
|
+
this.createChildItem(htmlParser(this.node.innerHTML))
|
|
14
|
+
}
|
|
10
15
|
}
|
|
11
16
|
}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import { eventHandler, getComponentEventCallback, AREA_CHANGE_EVENT_NAME, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
|
|
2
2
|
|
|
3
3
|
import commonStyleModify from './style'
|
|
4
|
-
import {
|
|
4
|
+
import { parseStyles, shouldBindEvent, getNodeThresholds, getStyleAttr } from './utils/helper'
|
|
5
5
|
import { INPUT_TYPE_MAP, INPUT_CONFIRM_MAP } from './utils/constant/style'
|
|
6
6
|
|
|
7
7
|
import type { TaroStyleType, TaroAny, TaroInputElement, TaroEvent } from '@tarojs/runtime'
|
|
8
8
|
|
|
9
9
|
interface InputAttrs {
|
|
10
10
|
textAlign?: TextAlign
|
|
11
|
+
autoFocus?: boolean
|
|
12
|
+
disabled?: boolean
|
|
11
13
|
}
|
|
12
14
|
|
|
13
15
|
@Extend(TextInput)
|
|
@@ -22,12 +24,15 @@ function styles (style: TaroStyleType) {
|
|
|
22
24
|
@Extend(TextInput)
|
|
23
25
|
function attrs(attr: InputAttrs) {
|
|
24
26
|
.textAlign(attr.textAlign)
|
|
27
|
+
.defaultFocus(attr.autoFocus)
|
|
28
|
+
.enabled(!attr.disabled)
|
|
25
29
|
}
|
|
26
30
|
|
|
27
|
-
|
|
28
31
|
function getAttributes(node: TaroInputElement): InputAttrs {
|
|
29
32
|
return {
|
|
30
33
|
textAlign: node.hmStyle.textAlign,
|
|
34
|
+
autoFocus: node._attrs.autoFocus || node._attrs.focus || false,
|
|
35
|
+
disabled: node._attrs.disabled || false,
|
|
31
36
|
}
|
|
32
37
|
}
|
|
33
38
|
|
|
@@ -48,7 +53,10 @@ function getPlaceholderColor (node: TaroInputElement): string {
|
|
|
48
53
|
export default struct TaroInput {
|
|
49
54
|
@State value: string = ''
|
|
50
55
|
|
|
51
|
-
|
|
56
|
+
@Builder customBuilder() {}
|
|
57
|
+
@BuilderParam createLazyChildren: (node: TaroInputElement) => void = this.customBuilder
|
|
58
|
+
@ObjectLink node: TaroInputElement
|
|
59
|
+
@State overwriteStyle: Record<string, TaroAny> = {}
|
|
52
60
|
|
|
53
61
|
aboutToAppear () {
|
|
54
62
|
if (this.node) {
|
|
@@ -63,43 +71,43 @@ export default struct TaroInput {
|
|
|
63
71
|
}
|
|
64
72
|
|
|
65
73
|
build () {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
|
|
74
|
+
TextInput({ text: this.value, placeholder: this.node._attrs?.placeholder || '', controller: this.node.controller })
|
|
75
|
+
.key(this.node._nid)
|
|
76
|
+
.type(getInputType(this.node))
|
|
77
|
+
.maxLength(Number(this.node._attrs?.maxlength) || null)
|
|
78
|
+
.placeholderColor(getPlaceholderColor(this.node))
|
|
79
|
+
.enterKeyType(INPUT_CONFIRM_MAP.get(this.node._attrs?.confirmType) || EnterKeyType.Done)
|
|
80
|
+
.padding(0) // Note: 移出 Input 默认 padding 设置
|
|
81
|
+
.backgroundColor(getStyleAttr(this.node, "backgroundColor"))//
|
|
82
|
+
.attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
83
|
+
.styles(this.node?.hmStyle)
|
|
84
|
+
.attrs(getAttributes(this.node))
|
|
85
|
+
.onChange((value: string) => {
|
|
86
|
+
const event: TaroEvent = createTaroEvent('input', { detail: { value } }, this.node)
|
|
87
|
+
|
|
88
|
+
this.value = value
|
|
89
|
+
this.node?.updateFormWidgetValue(value)
|
|
90
|
+
eventHandler(event, 'input', this.node)
|
|
91
|
+
})
|
|
92
|
+
.onSubmit(() => {
|
|
93
|
+
const event: TaroEvent = createTaroEvent('confirm', { detail: { value: this.value } }, this.node)
|
|
94
|
+
eventHandler(event, 'confirm', this.node)
|
|
95
|
+
})
|
|
96
|
+
.onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
|
|
97
|
+
.onBlur(() => {
|
|
98
|
+
const event: TaroEvent = createTaroEvent('blur', { detail: { value: this.value } }, this.node)
|
|
99
|
+
eventHandler(event, 'blur', this.node)
|
|
100
|
+
})
|
|
101
|
+
.onFocus(() => {
|
|
102
|
+
const event: TaroEvent = createTaroEvent('focus', { detail: { value: this.value, height: this.node?._height } }, this.node)
|
|
103
|
+
|
|
104
|
+
eventHandler(event, 'focus', this.node)
|
|
105
|
+
})
|
|
106
|
+
.onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
|
|
107
|
+
if (this.node) {
|
|
108
|
+
this.node._nodeInfo.areaInfo = res[1]
|
|
109
|
+
}
|
|
110
|
+
}))
|
|
111
|
+
.onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
|
|
104
112
|
}
|
|
105
113
|
}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
import { Current, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, getPageScrollerOrNode, AREA_CHANGE_EVENT_NAME } from '@tarojs/runtime'
|
|
2
2
|
|
|
3
|
-
import commonStyleModify from './style'
|
|
4
|
-
|
|
3
|
+
import commonStyleModify, { rowModify, columnModify } from './style'
|
|
4
|
+
|
|
5
5
|
import { TOUCH_EVENT_MAP } from './utils/constant/event'
|
|
6
|
-
import { FlexManager } from './utils/
|
|
7
|
-
import {
|
|
6
|
+
import { FlexManager } from './utils/flexManager'
|
|
7
|
+
import { shouldBindEvent, getNodeThresholds } from './utils/helper'
|
|
8
8
|
|
|
9
9
|
import type { TaroLabelElement, TaroElement, TaroAny, TaroRadioElement, TaroCheckboxElement } from '@tarojs/runtime'
|
|
10
|
+
import { isUndefined } from '@tarojs/shared'
|
|
10
11
|
|
|
11
12
|
function handleTargetChange (id: string) {
|
|
12
13
|
const taro: TaroAny = Current.taro
|
|
13
14
|
const page: TaroAny = taro.getCurrentInstance().page
|
|
14
|
-
const currentPageNode: TaroElement = getPageScrollerOrNode(page
|
|
15
|
-
const node: TaroElement | null = currentPageNode
|
|
15
|
+
const currentPageNode: TaroElement = getPageScrollerOrNode(page?.node, page)
|
|
16
|
+
const node: TaroElement | null = currentPageNode?.getElementById(id)
|
|
16
17
|
|
|
17
18
|
if (!node) return
|
|
18
19
|
|
|
@@ -34,45 +35,71 @@ function handleTargetChange (id: string) {
|
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
|
|
37
|
-
@
|
|
38
|
-
export default
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
@Component
|
|
39
|
+
export default struct TaroLabel {
|
|
40
|
+
@Builder customBuilder() {}
|
|
41
|
+
@BuilderParam createLazyChildren: (node: TaroLabelElement) => void = this.customBuilder
|
|
42
|
+
@ObjectLink node: TaroLabelElement
|
|
43
|
+
@State overwriteStyle: Record<string, TaroAny> = {}
|
|
44
|
+
|
|
45
|
+
aboutToAppear(): void {
|
|
46
|
+
if (this.node) {
|
|
47
|
+
this.node._instance = this
|
|
42
48
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
build() {
|
|
52
|
+
if (FlexManager.useFlexLayout(this.node)) {
|
|
53
|
+
Flex(FlexManager.flexOptions(this.node)) {
|
|
54
|
+
this.createLazyChildren(this.node)
|
|
55
|
+
}
|
|
56
|
+
.attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
57
|
+
.onClick((e: ClickEvent) => {
|
|
58
|
+
const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
|
|
59
|
+
const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
|
|
60
|
+
|
|
61
|
+
handleTargetChange(id)
|
|
62
|
+
eventHandler(e, 'click', this.node)
|
|
63
|
+
})
|
|
64
|
+
.onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
|
|
65
|
+
.onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
|
|
66
|
+
this.node._nodeInfo.areaInfo = res[1]
|
|
67
|
+
}))
|
|
68
|
+
.onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
|
|
69
|
+
} else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
|
|
70
|
+
Row() {
|
|
71
|
+
this.createLazyChildren(this.node)
|
|
72
|
+
}
|
|
73
|
+
.attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
74
|
+
.onClick((e: ClickEvent) => {
|
|
75
|
+
const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
|
|
76
|
+
const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
|
|
77
|
+
|
|
78
|
+
handleTargetChange(id)
|
|
79
|
+
eventHandler(e, 'click', this.node)
|
|
80
|
+
})
|
|
81
|
+
.onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
|
|
82
|
+
.onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
|
|
83
|
+
this.node._nodeInfo.areaInfo = res[1]
|
|
84
|
+
}))
|
|
85
|
+
.onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
|
|
86
|
+
} else {
|
|
87
|
+
Column() {
|
|
88
|
+
this.createLazyChildren(this.node)
|
|
89
|
+
}
|
|
90
|
+
.attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
91
|
+
.onClick((e: ClickEvent) => {
|
|
92
|
+
const firstChild: TaroElement | null = this.node.childNodes[0] as TaroElement | null
|
|
93
|
+
const id: string = this.node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
|
|
94
|
+
|
|
95
|
+
handleTargetChange(id)
|
|
96
|
+
eventHandler(e, 'click', this.node)
|
|
97
|
+
})
|
|
98
|
+
.onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), this.node), this.node, TOUCH_EVENT_MAP.values()))
|
|
99
|
+
.onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
|
|
100
|
+
this.node._nodeInfo.areaInfo = res[1]
|
|
101
|
+
}))
|
|
102
|
+
.onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
|
|
61
103
|
}
|
|
62
|
-
.attributeModifier(commonStyleModify.setNode(node))
|
|
63
|
-
.onClick((e: ClickEvent) => {
|
|
64
|
-
const firstChild: TaroElement | null = node.childNodes[0] as TaroElement | null
|
|
65
|
-
const id: string = node._attrs.for || firstChild?._attrs.id || firstChild?._nid || ''
|
|
66
|
-
|
|
67
|
-
handleTargetChange(id)
|
|
68
|
-
eventHandler(e, 'click', node)
|
|
69
|
-
})
|
|
70
|
-
.onTouch(shouldBindEvent((e: TouchEvent) => eventHandler(e, TOUCH_EVENT_MAP.get(e.type), node), node, TOUCH_EVENT_MAP.values()))
|
|
71
|
-
.onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
|
|
72
|
-
node._nodeInfo.areaInfo = res[1]
|
|
73
|
-
}))
|
|
74
|
-
.onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
|
|
75
|
-
.alignItems(FlexManager.flexOptions(node).alignItems as HorizontalAlign)
|
|
76
|
-
.justifyContent(FlexManager.flexOptions(node).justifyContent)
|
|
77
104
|
}
|
|
78
105
|
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import commonStyleModify from './style'
|
|
2
|
+
|
|
3
|
+
import type { TaroViewElement, TaroAny } from '@tarojs/runtime'
|
|
4
|
+
|
|
5
|
+
@Component
|
|
6
|
+
export default struct TaroListView {
|
|
7
|
+
@Builder customBuilder() {}
|
|
8
|
+
@BuilderParam createLazyChildren: (node: TaroViewElement) => void = this.customBuilder
|
|
9
|
+
@ObjectLink node: TaroViewElement
|
|
10
|
+
@State overwriteStyle: Record<string, TaroAny> = {}
|
|
11
|
+
|
|
12
|
+
aboutToAppear(): void {
|
|
13
|
+
if (this.node) {
|
|
14
|
+
this.node._instance = this
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
build() {
|
|
19
|
+
ListItem() {
|
|
20
|
+
Stack() {
|
|
21
|
+
this.createLazyChildren(this.node)
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
.attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
25
|
+
}
|
|
26
|
+
}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import type { TaroAny, TaroMovableAreaElement, TaroMovableViewElement } from '@tarojs/runtime'
|
|
2
|
+
import { isTaroMovableViewElement } from '@tarojs/runtime'
|
|
3
|
+
import commonStyleModify, { rowModify, columnModify } from './style'
|
|
4
|
+
|
|
5
|
+
import { FlexManager } from './utils/flexManager'
|
|
6
|
+
import { isUndefined } from '@tarojs/shared'
|
|
7
|
+
|
|
8
|
+
@Component
|
|
9
|
+
export default struct TaroMovableArea {
|
|
10
|
+
@Builder
|
|
11
|
+
customBuilder() {
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
@BuilderParam createLazyChildren: (node: TaroMovableAreaElement) => void = this.customBuilder
|
|
15
|
+
@ObjectLink node: TaroMovableAreaElement
|
|
16
|
+
@State overwriteStyle: Record<string, TaroAny> = {}
|
|
17
|
+
|
|
18
|
+
aboutToAppear(): void {
|
|
19
|
+
if (this.node) {
|
|
20
|
+
this.node._instance = this
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
build() {
|
|
29
|
+
if (FlexManager.useFlexLayout(this.node)) {
|
|
30
|
+
Flex(FlexManager.flexOptions(this.node)) {
|
|
31
|
+
this.createLazyChildren(this.node)
|
|
32
|
+
}
|
|
33
|
+
.attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
34
|
+
.clip(true)
|
|
35
|
+
.onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
|
|
36
|
+
sizeChangeHandle(this.node, newValue)
|
|
37
|
+
})
|
|
38
|
+
.gesture(
|
|
39
|
+
PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
|
|
40
|
+
this.node.childNodes.forEach(item => {
|
|
41
|
+
if (isTaroMovableViewElement(item)) {
|
|
42
|
+
item.startScale()
|
|
43
|
+
}
|
|
44
|
+
})
|
|
45
|
+
}).onActionUpdate((event) => {
|
|
46
|
+
const scaleArea = this.node.getAttribute('scaleArea')
|
|
47
|
+
if (scaleArea) {
|
|
48
|
+
this.node.childNodes.forEach(item => {
|
|
49
|
+
if (isTaroMovableViewElement(item)) {
|
|
50
|
+
item.doScale(event.scale)
|
|
51
|
+
}
|
|
52
|
+
})
|
|
53
|
+
}
|
|
54
|
+
})
|
|
55
|
+
)
|
|
56
|
+
} else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
|
|
57
|
+
Row() {
|
|
58
|
+
this.createLazyChildren(this.node)
|
|
59
|
+
}
|
|
60
|
+
.attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
61
|
+
.clip(true)
|
|
62
|
+
.onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
|
|
63
|
+
sizeChangeHandle(this.node, newValue)
|
|
64
|
+
})
|
|
65
|
+
.gesture(
|
|
66
|
+
PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
|
|
67
|
+
this.node.childNodes.forEach(item => {
|
|
68
|
+
if (isTaroMovableViewElement(item)) {
|
|
69
|
+
item.startScale()
|
|
70
|
+
}
|
|
71
|
+
})
|
|
72
|
+
}).onActionUpdate((event) => {
|
|
73
|
+
const scaleArea = this.node.getAttribute('scaleArea')
|
|
74
|
+
if (scaleArea) {
|
|
75
|
+
this.node.childNodes.forEach(item => {
|
|
76
|
+
if (isTaroMovableViewElement(item)) {
|
|
77
|
+
item.doScale(event.scale)
|
|
78
|
+
}
|
|
79
|
+
})
|
|
80
|
+
}
|
|
81
|
+
})
|
|
82
|
+
)
|
|
83
|
+
} else {
|
|
84
|
+
Column() {
|
|
85
|
+
this.createLazyChildren(this.node)
|
|
86
|
+
}
|
|
87
|
+
.attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
88
|
+
.clip(true)
|
|
89
|
+
.onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
|
|
90
|
+
sizeChangeHandle(this.node, newValue)
|
|
91
|
+
})
|
|
92
|
+
.gesture(
|
|
93
|
+
PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
|
|
94
|
+
this.node.childNodes.forEach(item => {
|
|
95
|
+
if (isTaroMovableViewElement(item)) {
|
|
96
|
+
item.startScale()
|
|
97
|
+
}
|
|
98
|
+
})
|
|
99
|
+
}).onActionUpdate((event) => {
|
|
100
|
+
const scaleArea = this.node.getAttribute('scaleArea')
|
|
101
|
+
if (scaleArea) {
|
|
102
|
+
this.node.childNodes.forEach(item => {
|
|
103
|
+
if (isTaroMovableViewElement(item)) {
|
|
104
|
+
item.doScale(event.scale)
|
|
105
|
+
}
|
|
106
|
+
})
|
|
107
|
+
}
|
|
108
|
+
})
|
|
109
|
+
)
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
|
|
115
|
+
function sizeChangeHandle(node: TaroMovableAreaElement, newValue: Area | SizeOptions) {
|
|
116
|
+
node.childNodes.forEach(item => {
|
|
117
|
+
if (isTaroMovableViewElement(item)) {
|
|
118
|
+
if (item.area?.w !== Number(newValue.width) || item.area?.h !== Number(newValue.height)) {
|
|
119
|
+
item.area = {
|
|
120
|
+
w: Number(newValue.width),
|
|
121
|
+
h: Number(newValue.height)
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
})
|
|
126
|
+
}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import type { TaroAny, TaroMovableViewElement, TaroElement } from '@tarojs/runtime'
|
|
2
|
+
|
|
3
|
+
import commonStyleModify, { rowModify, columnModify } from './style'
|
|
4
|
+
|
|
5
|
+
import { FlexManager } from './utils/flexManager'
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
@Component
|
|
10
|
+
export default struct TaroMovableView {
|
|
11
|
+
@Builder customBuilder() {}
|
|
12
|
+
@BuilderParam createLazyChildren: (node: TaroMovableViewElement) => void = this.customBuilder
|
|
13
|
+
@ObjectLink node: TaroMovableViewElement
|
|
14
|
+
@State overwriteStyle: Record<string, TaroAny> = {}
|
|
15
|
+
|
|
16
|
+
aboutToAppear(): void {
|
|
17
|
+
if (this.node) {
|
|
18
|
+
this.node._instance = this
|
|
19
|
+
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
build() {
|
|
24
|
+
Stack() {
|
|
25
|
+
if (FlexManager.useFlexLayout(this.node)) {
|
|
26
|
+
Flex(FlexManager.flexOptions(this.node)) {
|
|
27
|
+
this.createLazyChildren(this.node)
|
|
28
|
+
}
|
|
29
|
+
.attributeModifier(commonStyleModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
30
|
+
} else if (FlexManager.isFlexNode(this.node) && FlexManager.direction(this.node) !== FlexDirection.Column) {
|
|
31
|
+
Row() {
|
|
32
|
+
this.createLazyChildren(this.node)
|
|
33
|
+
}
|
|
34
|
+
.attributeModifier(rowModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
35
|
+
} else {
|
|
36
|
+
Column() {
|
|
37
|
+
this.createLazyChildren(this.node)
|
|
38
|
+
}
|
|
39
|
+
.attributeModifier(columnModify.setNode(this.node).setAnimationStyle(this.overwriteStyle))
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
.translate({ x: this.node.position.x, y: this.node.position.y })
|
|
43
|
+
.scale({ x: this.node.scaleValue, y: this.node.scaleValue })
|
|
44
|
+
.onSizeChange((oldValue: SizeOptions, newValue: SizeOptions) => {
|
|
45
|
+
if (this.node.selfSize?.w !== Number(newValue.width) || this.node.selfSize?.h !== Number(newValue.height)) {
|
|
46
|
+
this.node.selfSize = { w: Number(newValue.width), h: Number(newValue.height) }
|
|
47
|
+
}
|
|
48
|
+
})
|
|
49
|
+
.visibility(this.node.visibility)
|
|
50
|
+
.gesture(
|
|
51
|
+
GestureGroup(GestureMode.Parallel,
|
|
52
|
+
PanGesture(getPanOption(this.node)).onActionStart((e: GestureEvent) => {
|
|
53
|
+
|
|
54
|
+
this.node.startMove()
|
|
55
|
+
this.node.callTouchEventFnFromGesture('touchstart', e)
|
|
56
|
+
}).onActionUpdate((e: GestureEvent) => {
|
|
57
|
+
this.node.callTouchEventFnFromGesture('touchmove', e)
|
|
58
|
+
this.node.doMove({
|
|
59
|
+
x: e.offsetX,
|
|
60
|
+
y: e.offsetY
|
|
61
|
+
})
|
|
62
|
+
|
|
63
|
+
}).onActionEnd((e: GestureEvent) => {
|
|
64
|
+
this.node.callTouchEventFnFromGesture('touchend', e)
|
|
65
|
+
this.node.checkPositionBoundary(this.node.position, this.node.scaleValue)
|
|
66
|
+
}),
|
|
67
|
+
PinchGesture({ fingers: 2 }).onActionStart((event: GestureEvent) => {
|
|
68
|
+
this.node.startScale()
|
|
69
|
+
}).onActionUpdate((event) => {
|
|
70
|
+
this.node.doScale(event.scale)
|
|
71
|
+
})
|
|
72
|
+
)
|
|
73
|
+
)
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
function getPanOption(node: TaroMovableViewElement) {
|
|
79
|
+
const attrDirection = node.getAttribute('direction')
|
|
80
|
+
let panDirection = PanDirection.All
|
|
81
|
+
|
|
82
|
+
if(node.getAttribute('disabled')) {
|
|
83
|
+
panDirection = PanDirection.None
|
|
84
|
+
} else if(attrDirection === 'horizontal') {
|
|
85
|
+
panDirection = PanDirection.Horizontal
|
|
86
|
+
} else if (attrDirection === 'vertical') {
|
|
87
|
+
panDirection = PanDirection.Vertical
|
|
88
|
+
}
|
|
89
|
+
return new PanGestureOptions({
|
|
90
|
+
direction: panDirection,
|
|
91
|
+
fingers: 1
|
|
92
|
+
})
|
|
93
|
+
}
|