@tarojs/plugin-platform-harmony-ets 4.0.0-beta.39 → 4.0.0-beta.40

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.
@@ -23,7 +23,7 @@ import TaroMovableView from './movableView'
23
23
  import { TaroRadio, TaroRadioGroup } from './radio'
24
24
  import { TaroCheckboxGroup, TaroCheckbox } from './checkbox'
25
25
 
26
- import commonStyleModify from './style'
26
+ import commonStyleModify, { rowModify, columnModify } from './style'
27
27
  import { getButtonColor } from './button'
28
28
  import { FlexManager } from './utils/flexManager'
29
29
  import { DynamicCenter } from './utils/DynamicCenter'
@@ -39,6 +39,8 @@ export {
39
39
  shouldBindEvent,
40
40
  getFontAttributes,
41
41
  commonStyleModify,
42
+ rowModify,
43
+ columnModify,
42
44
  getNodeThresholds,
43
45
  BUTTON_THEME_COLOR,
44
46
  getNormalAttributes,
@@ -105,6 +105,7 @@ export default struct TaroScrollView {
105
105
  }
106
106
  .width(getStyleAttr(this.node, 'width'))
107
107
  .height(getStyleAttr(this.node, 'height'))
108
+ .align(Alignment.TopStart)
108
109
  .flexGrow(this.node.hmStyle?.flexGrow)
109
110
  .flexShrink(this.node.hmStyle?.flexShrink)
110
111
  .scrollable(getScrollable(this.node))
@@ -116,6 +116,9 @@ class RowStyleModify extends CommonStyleModify {
116
116
  if (this.node) {
117
117
  instance.alignItems(FlexManager.alignItems<VerticalAlign>(this.node))
118
118
  instance.justifyContent(FlexManager.justifyContent(this.node))
119
+ if (this.node._st.hmStyle.overflow === 'scroll') {
120
+ instance.height('100%')
121
+ }
119
122
  }
120
123
  }
121
124
 
@@ -136,6 +139,9 @@ class ColumnStyleModify extends CommonStyleModify {
136
139
  if (this.node) {
137
140
  instance.alignItems(FlexManager.alignItems<HorizontalAlign>(this.node))
138
141
  instance.justifyContent(FlexManager.justifyContent(this.node))
142
+ if (this.node._st.hmStyle.overflow === 'scroll') {
143
+ instance.width('100%')
144
+ }
139
145
  }
140
146
  }
141
147
 
@@ -448,7 +448,11 @@ export default function convertWebStyle2HmStyle(webStyle: CSSProperties, node?:
448
448
  break
449
449
  }
450
450
  case 'overflow': {
451
- hmStyle.overflow = value
451
+ if (value === 'auto') {
452
+ hmStyle.overflow = 'scroll'
453
+ } else {
454
+ hmStyle.overflow = value
455
+ }
452
456
  break
453
457
  }
454
458
  default: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/plugin-platform-harmony-ets",
3
- "version": "4.0.0-beta.39",
3
+ "version": "4.0.0-beta.40",
4
4
  "description": "OpenHarmony & 鸿蒙系统插件",
5
5
  "author": "O2Team",
6
6
  "homepage": "https://gitee.com/openharmony-sig/taro",
@@ -25,13 +25,13 @@
25
25
  },
26
26
  "dependencies": {
27
27
  "webpack-sources": "^3.2.3",
28
- "@tarojs/components": "4.0.0-beta.39",
29
- "@tarojs/helper": "4.0.0-beta.39",
30
- "@tarojs/runtime": "4.0.0-beta.39",
31
- "@tarojs/shared": "4.0.0-beta.39",
32
- "@tarojs/taro": "4.0.0-beta.39",
33
- "@tarojs/runner-utils": "4.0.0-beta.39",
34
- "@tarojs/service": "4.0.0-beta.39"
28
+ "@tarojs/components": "4.0.0-beta.40",
29
+ "@tarojs/helper": "4.0.0-beta.40",
30
+ "@tarojs/runner-utils": "4.0.0-beta.40",
31
+ "@tarojs/runtime": "4.0.0-beta.40",
32
+ "@tarojs/shared": "4.0.0-beta.40",
33
+ "@tarojs/taro": "4.0.0-beta.40",
34
+ "@tarojs/service": "4.0.0-beta.40"
35
35
  },
36
36
  "devDependencies": {
37
37
  "@rollup/plugin-commonjs": "^25.0.7",
@@ -44,7 +44,7 @@
44
44
  "solid-js": "^1.8.16",
45
45
  "tslib": "^2.4.0",
46
46
  "typescript": "^4.8.2",
47
- "rollup-plugin-copy": "4.0.0-beta.39"
47
+ "rollup-plugin-copy": "4.0.0-beta.40"
48
48
  },
49
49
  "scripts": {
50
50
  "prebuild": "rimraf ./dist",