@mpxjs/webpack-plugin 2.10.3-beta.12 → 2.10.3-beta.14

package/lib/runtime/components/web/mpx-titlebar.vue

@@ -72,14 +72,6 @@ export default {
         height: this.innerHeight
       }
     }
-    ,
-    // content wrapper style: padding-top to avoid being covered by fixed titlebar
-    contentStyle () {
-      // use calc to combine innerHeight and safe-area inset
-      return {
-        paddingTop: this.hidden ? '0px' : `calc(${this.innerHeight} + env(safe-area-inset-top, 0px))`
-      }
-    }
   },
   methods: {
     // 左侧点击：派发事件并在可回退时回退
@@ -131,35 +123,28 @@ export default {
     ]
 
   // top-level wrapper: contains fixed titlebar and page content wrapper
-  return h('page', { class: 'mpx-titlebar-wrapper' }, [
-      // fixed titlebar
-      h('div', {
-        class: ['mpx-titlebar', { 'mpx-titlebar--hidden': this.hidden }],
-        style: this.rootStyle
-      }, [
-        h('div', { class: 'mpx-titlebar__safe', style: this.safeStyle }, [
-          h('div', { class: 'mpx-titlebar__inner', style: this.innerStyle }, [
-              h('div', { class: 'mpx-titlebar__left', on: { click: this.onLeftClick } }, leftChildren),
-              h('div', { class: 'mpx-titlebar__center' }, centerChildren),
-              h('div', { class: 'mpx-titlebar__right' }, [])
-          ])
+  return h('div', { class: 'page-wrapper' }, [
+    h('div', {
+      class: ['mpx-titlebar', { 'mpx-titlebar--hidden': this.hidden }],
+      style: this.rootStyle
+    }, [
+      h('div', { class: 'mpx-titlebar__safe', style: this.safeStyle }, [
+        h('div', { class: 'mpx-titlebar__inner', style: this.innerStyle }, [
+            h('div', { class: 'mpx-titlebar__left', on: { click: this.onLeftClick } }, leftChildren),
+            h('div', { class: 'mpx-titlebar__center' }, centerChildren),
+            h('div', { class: 'mpx-titlebar__right' }, [])
         ])
-      ]),
-
-      // page content wrapper: default slot is page content
-      h('div', { class: 'mpx-titlebar__content', style: this.contentStyle }, [
-        h('div', { class: 'mpx-titlebar__scroll' }, this.$slots.default || [])
       ])
-    ])
+    ]),
+    h('page', {}, [ this.$slots.default ])
+  ])
   }
 }
 </script>
 
 <style scoped>
-.mpx-titlebar {
-  width: 100%;
-  box-sizing: border-box;
-  -webkit-font-smoothing: antialiased;
+.page-wrapper {
+  padding-top: calc(env(safe-area-inset-top, 0px) + 44px);
 }
 .mpx-titlebar--hidden {
   display: none;
@@ -207,25 +192,22 @@ export default {
   cursor: pointer;
 }
 
-/* wrapper and content layout */
-.mpx-titlebar-wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-
 .mpx-titlebar {
+  /* flex-shrink: 0; */
+  height: calc(env(safe-area-inset-top, 0px) + 44px);
+  width: 100%;
+  box-sizing: border-box;
+  -webkit-font-smoothing: antialiased;
   position: fixed;
   top: 0;
   left: 0;
   right: 0;
-  z-index: 1000;
+  z-index: 99999;
 }
 
 .mpx-titlebar__content {
-  box-sizing: border-box;
-  width: 100vw;
-  height: 100vh;
+  flex: 1;
+  overflow: hidden;
   transform: translateZ(0);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.3-beta.12",
+  "version": "2.10.3-beta.14",
   "description": "mpx compile core",
   "keywords": [
     "mpx"