From 6ba6395221530dd890bd84133a3fba253a523178 Mon Sep 17 00:00:00 2001
From: "jiangmiao.yjj" <jiangmiao.yjj@alibaba-inc.com>
Date: Wed, 30 Nov 2022 10:57:19 +0800
Subject: [PATCH] feat: support page-container

---
 packages/miniapp-render/CHANGELOG.md          |  5 ++++
 packages/miniapp-render/package.json          |  2 +-
 .../src/builtInComponents/index.js            |  4 ++-
 .../src/builtInComponents/page-container.js   |  3 ++
 packages/miniapp-render/src/constants.js      |  2 +-
 .../CHANGELOG.md                              |  6 ++++
 .../package.json                              |  2 +-
 .../src/platforms/wechat.js                   | 29 +++++++++++++++++--
 8 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 packages/miniapp-render/src/builtInComponents/page-container.js

diff --git a/packages/miniapp-render/CHANGELOG.md b/packages/miniapp-render/CHANGELOG.md
index 88f2fa16..e5b3a257 100644
--- a/packages/miniapp-render/CHANGELOG.md
+++ b/packages/miniapp-render/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [2.8.10] - 2022-11-30
+
+### Added
+
+- Support `page-container` native component in wechat-miniprogram
 
 ## [2.8.9] - 2022-03-23
 
diff --git a/packages/miniapp-render/package.json b/packages/miniapp-render/package.json
index b6c29986..2f60fdd6 100644
--- a/packages/miniapp-render/package.json
+++ b/packages/miniapp-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "miniapp-render",
-  "version": "2.8.9",
+  "version": "2.8.10",
   "description": "DOM simulator for MiniApp",
   "files": [
     "dist"
diff --git a/packages/miniapp-render/src/builtInComponents/index.js b/packages/miniapp-render/src/builtInComponents/index.js
index 9f0e7749..03747d47 100644
--- a/packages/miniapp-render/src/builtInComponents/index.js
+++ b/packages/miniapp-render/src/builtInComponents/index.js
@@ -40,6 +40,7 @@ import contactButton from './contact-button';
 
 // WeChat only
 import adCustom from './ad-custom';
+import pageContainer from './page-container';
 
 // Alibaba MiniApp only
 import lifestyle from './lifestyle';
@@ -88,7 +89,8 @@ let components = [
   swiperItem,
   pickerViewColumn,
   officialAccount,
-  contactButton
+  contactButton,
+  pageContainer
 ];
 
 if (isWeChatMiniProgram) {
diff --git a/packages/miniapp-render/src/builtInComponents/page-container.js b/packages/miniapp-render/src/builtInComponents/page-container.js
new file mode 100644
index 00000000..25813438
--- /dev/null
+++ b/packages/miniapp-render/src/builtInComponents/page-container.js
@@ -0,0 +1,3 @@
+export default {
+  name: 'page-container'
+};
\ No newline at end of file
diff --git a/packages/miniapp-render/src/constants.js b/packages/miniapp-render/src/constants.js
index 3b8e77c8..cba1548a 100644
--- a/packages/miniapp-render/src/constants.js
+++ b/packages/miniapp-render/src/constants.js
@@ -30,7 +30,7 @@ const BUILTIN_COMPONENT_LIST = new Set([
 if (isMiniApp) {
   BUILTIN_COMPONENT_LIST.add('lifestyle').add('life-follow');
 } else if (isWeChatMiniProgram) {
-  BUILTIN_COMPONENT_LIST.add('ad-custom');
+  BUILTIN_COMPONENT_LIST.add('ad-custom').add('page-container');
 }
 
 export { BUILTIN_COMPONENT_LIST };
diff --git a/packages/rax-miniapp-runtime-webpack-plugin/CHANGELOG.md b/packages/rax-miniapp-runtime-webpack-plugin/CHANGELOG.md
index dc5caffd..e619e1cb 100644
--- a/packages/rax-miniapp-runtime-webpack-plugin/CHANGELOG.md
+++ b/packages/rax-miniapp-runtime-webpack-plugin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.0.5] - 2022-11-30
+
+### Added
+
+- Support `page-container` native component in wechat-miniprogram
+
 ## [5.0.4] - 2022-08-30
 
 ### Fixed
diff --git a/packages/rax-miniapp-runtime-webpack-plugin/package.json b/packages/rax-miniapp-runtime-webpack-plugin/package.json
index 4001eebb..5763c8fa 100644
--- a/packages/rax-miniapp-runtime-webpack-plugin/package.json
+++ b/packages/rax-miniapp-runtime-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rax-miniapp-runtime-webpack-plugin",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "A webpack plugin for miniapp runtime build",
   "main": "src/index.js",
   "files": [
diff --git a/packages/rax-miniapp-runtime-webpack-plugin/src/platforms/wechat.js b/packages/rax-miniapp-runtime-webpack-plugin/src/platforms/wechat.js
index 8201b6e3..7028e383 100644
--- a/packages/rax-miniapp-runtime-webpack-plugin/src/platforms/wechat.js
+++ b/packages/rax-miniapp-runtime-webpack-plugin/src/platforms/wechat.js
@@ -883,6 +883,29 @@ const AdCustom = {
   }
 };
 
+const PageContainer = {
+  props: {
+    'show': 'false',
+    'duration': '300',
+    'z-index': '100',
+    'overlay': 'true',
+    'position': addSingleQuote('bottom'),
+    'round': 'false',
+    'close-on-slide-down': 'false',
+    'overlay-style': '',
+    'custom-style': '',
+  },
+  events: {
+    BeforeEnter: '',
+    Enter: '',
+    AfterEnter: '',
+    BeforeLeave: '',
+    Leave: '',
+    AfterLeave: '',
+    ClickOverlay: '',
+  }
+};
+
 exports.internalComponents = {
   View,
   CatchView,
@@ -935,7 +958,8 @@ exports.internalComponents = {
   CatchHElement,
   PureHElement,
   NoTouchHElement,
-  HComment
+  HComment,
+  PageContainer
 };
 
 exports.derivedComponents = new Map([
@@ -1006,7 +1030,8 @@ exports.nestElements = new Map([
   ['Form', 4],
   ['ScrollView', 4],
   ['Swiper', 4],
-  ['SwiperItem', 4]
+  ['SwiperItem', 4],
+  ['PageContainer', 4],
 ]);
 
 exports.shouldNotGenerateTemplateComponents = new Set([