@mpxjs/webpack-plugin 2.10.3-beta.16 → 2.10.3-beta.17

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.
@@ -58,8 +58,8 @@ export default {
58
58
  },
59
59
  warpStyle() {
60
60
  return {
61
- // marginTop: this.hidden ? '0' : 'calc(env(safe-area-inset-top, 0px) + 44px)',
62
- height: this.hidden ? '100%' : 'calc(100% - env(safe-area-inset-top, 0px) - 44px)'
61
+ paddingTop: 'calc(env(safe-area-inset-top, 0px) + 44px)',
62
+ height: '100%'
63
63
  }
64
64
  },
65
65
  // 内部标题栏高度(遵循小程序常见平台差异)
@@ -129,10 +129,9 @@ export default {
129
129
  ]
130
130
 
131
131
  // top-level wrapper: contains fixed titlebar and page content wrapper
132
- return h('div', { class: 'mpx-page-warp', style: this.warpStyle }, [
133
- h('div', { style: { width: '100%', height: this.hidden ? '0' : 'calc(env(safe-area-inset-top, 0px) + 44px)' } }),
134
- h('div', {
135
- class: ['mpx-titlebar', { 'mpx-titlebar--hidden': this.hidden }],
132
+ return h('div', { class: 'mpx-page-warp', style: this.hidden ? {} : this.warpStyle }, [
133
+ this.hidden ? null : h('div', {
134
+ class: ['mpx-titlebar'],
136
135
  style: this.rootStyle
137
136
  }, [
138
137
  h('div', { class: 'mpx-titlebar__safe', style: this.safeStyle }, [
@@ -143,7 +142,7 @@ export default {
143
142
  ])
144
143
  ])
145
144
  ]),
146
- h('page', {}, [this.$slots.default])
145
+ h('page', { style: { position: 'relative'} }, [this.$slots.default])
147
146
  ])
148
147
  }
149
148
  }
@@ -153,14 +152,8 @@ export default {
153
152
  .mpx-page-warp {
154
153
  width: 100%;
155
154
  box-sizing: border-box;
156
- position: relative
157
155
  }
158
156
 
159
- /* 防止margin溢出合并 */
160
- .mpx-page-warp::before {
161
- content: '';
162
- display: table
163
- }
164
157
 
165
158
  .mpx-titlebar--hidden {
166
159
  display: none;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mpxjs/webpack-plugin",
3
- "version": "2.10.3-beta.16",
3
+ "version": "2.10.3-beta.17",
4
4
  "description": "mpx compile core",
5
5
  "keywords": [
6
6
  "mpx"