@blocklet/launcher-workflow 2.3.117 → 2.3.118

package/es/locales/en.js

@@ -104,7 +104,7 @@ export default {
     pageTitle: 'Purchase Space',
     noPlan: 'Select space to continue',
     hasPlan: 'Continue with {name}',
-    selectSpaceHint: 'Already have dedicated space? Click here to select >',
+    selectSpaceHint: 'Already have dedicated space? ',
     morePlanPrompt: 'Flip the page to see more plans',
     redeem: 'Select purchased space',
     noProducts: 'No products available for purchase, please check your payment-kit config',

package/es/locales/zh.js

@@ -102,7 +102,7 @@ export default {
   },
   purchase: {
     pageTitle: '选购空间',
-    selectSpaceHint: '已有专用空间？点击这里选择 >',
+    selectSpaceHint: '已有专用空间？',
     morePlanPrompt: '翻页看更多方案',
     redeem: '我已购买空间',
     noPlan: '选择套餐以继续',

package/es/prepare.js

@@ -4,7 +4,6 @@ import { LAUNCH_STATUS } from '@blocklet/launcher-util/es/constant';
 import { getBlockletAdminURL, getBlockletLogoUrl, getBlockletMetaUrlFromQuery } from '@blocklet/launcher-util/es/util';
 import formatError from '@blocklet/launcher-util/lib/format-error';
 import CheckoutOnDemand from '@blocklet/launcher-ux/lib/payment/checkout/on-demand';
-import useMobile from '@blocklet/launcher-ux/lib/use-mobile';
 import { CheckoutTable, PaymentProvider } from '@blocklet/payment-react';
 import styled from '@emotion/styled';
 import Box from '@mui/material/Box';
@@ -60,9 +59,6 @@ function Content({
     t,
     locale
   } = useLocaleContext();
-  const {
-    isMobile
-  } = useMobile();
   const navigate = useNavigate();
   const sessionId = params.get('sessionId');
   const blockletMetaUrl = getBlockletMetaUrlFromQuery(params);
@@ -241,34 +237,64 @@ function Content({
         height: '100%',
         alignItems: 'center'
       },
-      children: [productTypes.length > 1 && /*#__PURE__*/_jsx(ToggleButtonGroup, {
-        orientation: "horizontal",
-        color: "primary",
-        value: state.productType?.name,
-        size: "small",
-        onChange: handleChangeProductType,
-        exclusive: true,
+      children: [/*#__PURE__*/_jsxs(Stack, {
+        width: "100%",
         sx: {
-          marginTop: '8px'
+          position: 'relative',
+          '@media (min-width: 1200px)': {
+            maxWidth: '1000px'
+          },
+          '@media (max-width: 1200px)': {
+            maxWidth: '100%'
+          },
+          flexWrap: 'wrap',
+          flexDirection: {
+            xs: 'column',
+            md: 'row'
+          },
+          justifyContent: {
+            xs: 'center',
+            md: 'space-between'
+          },
+          alignItems: 'center',
+          gap: 2
         },
-        children: productTypes.map(({
-          name
-        }) => {
-          return /*#__PURE__*/_jsx(ToggleButton, {
-            value: name,
-            sx: {
-              textTransform: 'capitalize'
-            },
-            children: t(`purchase.productType.${name}`)
-          }, name);
-        })
+        children: [productTypes.length > 1 && /*#__PURE__*/_jsx(ToggleButtonGroup, {
+          orientation: "horizontal",
+          color: "primary",
+          value: state.productType?.name,
+          size: "small",
+          onChange: handleChangeProductType,
+          exclusive: true,
+          children: productTypes.map(({
+            name
+          }) => {
+            return /*#__PURE__*/_jsx(ToggleButton, {
+              value: name,
+              sx: {
+                textTransform: 'capitalize'
+              },
+              children: t(`purchase.productType.${name}`)
+            }, name);
+          })
+        }), /*#__PURE__*/_jsx(Box, {
+          component: Link,
+          sx: {
+            color: 'text.link',
+            '&:hover': {
+              opacity: 0.8
+            }
+          },
+          to: joinURL(routerPrefix, `/purchase/select${window.location.search}`),
+          children: t('purchase.selectSpaceHint')
+        })]
       }), /*#__PURE__*/_jsxs(Box, {
         sx: {
           width: '100%',
           height: '100%',
           marginTop: '24px',
           '@media (min-width: 1200px)': {
-            maxWidth: '960px'
+            maxWidth: '1000px'
           },
           '@media (max-width: 1200px)': {
             maxWidth: '100%'
@@ -299,7 +325,8 @@ function Content({
           api: launchSessionAPI,
           freeTrialProducts: launchState.value?.metadata?.freeTrialProducts || [],
           checkoutPath: "/payment/checkout",
-          minStakeAmount: launchState.value?.metadata?.minStakeAmount
+          minStakeAmount: launchState.value?.metadata?.minStakeAmount,
+          blockletMeta: launch?.blockletMeta
         }), state.productType?.name === 'dedicated' && window.blocklet?.preferences?.dedicatedPricingTableId && /*#__PURE__*/_jsx(Box, {
           sx: {
             display: 'flex',
@@ -323,12 +350,6 @@ function Content({
                 marginBottom: 0
               }
             },
-            '& .cko-payment-submit': {
-              marginTop: 0,
-              '& button': {
-                fontSize: '1rem !important'
-              }
-            },
             '& .btn-row': {
               justifyContent: 'center !important'
             }
@@ -349,24 +370,6 @@ function Content({
             })
           })
         })]
-      }), /*#__PURE__*/_jsx(Box, {
-        sx: {
-          display: 'flex',
-          justifyContent: 'space-between'
-        },
-        children: /*#__PURE__*/_jsx(Box, {
-          component: Link,
-          sx: {
-            color: 'text.secondary',
-            marginTop: '24px',
-            marginBottom: isMobile ? '64px' : '12px',
-            '&:hover': {
-              textDecoration: 'underline !important'
-            }
-          },
-          to: joinURL(routerPrefix, `/purchase/select${window.location.search}`),
-          children: t('purchase.selectSpaceHint')
-        })
       })]
     })
   });

package/lib/locales/en.js

@@ -110,7 +110,7 @@ var _default = exports.default = {
     pageTitle: 'Purchase Space',
     noPlan: 'Select space to continue',
     hasPlan: 'Continue with {name}',
-    selectSpaceHint: 'Already have dedicated space? Click here to select >',
+    selectSpaceHint: 'Already have dedicated space? ',
     morePlanPrompt: 'Flip the page to see more plans',
     redeem: 'Select purchased space',
     noProducts: 'No products available for purchase, please check your payment-kit config',

package/lib/locales/zh.js

@@ -108,7 +108,7 @@ var _default = exports.default = {
   },
   purchase: {
     pageTitle: '选购空间',
-    selectSpaceHint: '已有专用空间？点击这里选择 >',
+    selectSpaceHint: '已有专用空间？',
     morePlanPrompt: '翻页看更多方案',
     redeem: '我已购买空间',
     noPlan: '选择套餐以继续',

package/lib/prepare.js

@@ -10,7 +10,6 @@ var _constant = require("@blocklet/launcher-util/es/constant");
 var _util = require("@blocklet/launcher-util/es/util");
 var _formatError = _interopRequireDefault(require("@blocklet/launcher-util/lib/format-error"));
 var _onDemand = _interopRequireDefault(require("@blocklet/launcher-ux/lib/payment/checkout/on-demand"));
-var _useMobile = _interopRequireDefault(require("@blocklet/launcher-ux/lib/use-mobile"));
 var _paymentReact = require("@blocklet/payment-react");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
@@ -63,9 +62,6 @@ function Content(_ref) {
     t,
     locale
   } = (0, _locale.useLocaleContext)();
-  const {
-    isMobile
-  } = (0, _useMobile.default)();
   const navigate = (0, _reactRouterDom.useNavigate)();
   const sessionId = params.get('sessionId');
   const blockletMetaUrl = (0, _util.getBlockletMetaUrlFromQuery)(params);
@@ -254,35 +250,65 @@ function Content(_ref) {
         height: '100%',
         alignItems: 'center'
       },
-      children: [productTypes.length > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleButtonGroup.default, {
-        orientation: "horizontal",
-        color: "primary",
-        value: (_state$productType = state.productType) === null || _state$productType === void 0 ? void 0 : _state$productType.name,
-        size: "small",
-        onChange: handleChangeProductType,
-        exclusive: true,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Stack.default, {
+        width: "100%",
         sx: {
-          marginTop: '8px'
+          position: 'relative',
+          '@media (min-width: 1200px)': {
+            maxWidth: '1000px'
+          },
+          '@media (max-width: 1200px)': {
+            maxWidth: '100%'
+          },
+          flexWrap: 'wrap',
+          flexDirection: {
+            xs: 'column',
+            md: 'row'
+          },
+          justifyContent: {
+            xs: 'center',
+            md: 'space-between'
+          },
+          alignItems: 'center',
+          gap: 2
         },
-        children: productTypes.map(_ref2 => {
-          let {
-            name
-          } = _ref2;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleButton.default, {
-            value: name,
-            sx: {
-              textTransform: 'capitalize'
-            },
-            children: t("purchase.productType.".concat(name))
-          }, name);
-        })
+        children: [productTypes.length > 1 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleButtonGroup.default, {
+          orientation: "horizontal",
+          color: "primary",
+          value: (_state$productType = state.productType) === null || _state$productType === void 0 ? void 0 : _state$productType.name,
+          size: "small",
+          onChange: handleChangeProductType,
+          exclusive: true,
+          children: productTypes.map(_ref2 => {
+            let {
+              name
+            } = _ref2;
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToggleButton.default, {
+              value: name,
+              sx: {
+                textTransform: 'capitalize'
+              },
+              children: t("purchase.productType.".concat(name))
+            }, name);
+          })
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+          component: _reactRouterDom.Link,
+          sx: {
+            color: 'text.link',
+            '&:hover': {
+              opacity: 0.8
+            }
+          },
+          to: (0, _urlJoin.default)(routerPrefix, "/purchase/select".concat(window.location.search)),
+          children: t('purchase.selectSpaceHint')
+        })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         sx: {
           width: '100%',
           height: '100%',
           marginTop: '24px',
           '@media (min-width: 1200px)': {
-            maxWidth: '960px'
+            maxWidth: '1000px'
           },
           '@media (max-width: 1200px)': {
             maxWidth: '100%'
@@ -314,7 +340,8 @@ function Content(_ref) {
           api: launchSessionAPI,
           freeTrialProducts: ((_launchState$value7 = launchState.value) === null || _launchState$value7 === void 0 || (_launchState$value7 = _launchState$value7.metadata) === null || _launchState$value7 === void 0 ? void 0 : _launchState$value7.freeTrialProducts) || [],
           checkoutPath: "/payment/checkout",
-          minStakeAmount: (_launchState$value8 = launchState.value) === null || _launchState$value8 === void 0 || (_launchState$value8 = _launchState$value8.metadata) === null || _launchState$value8 === void 0 ? void 0 : _launchState$value8.minStakeAmount
+          minStakeAmount: (_launchState$value8 = launchState.value) === null || _launchState$value8 === void 0 || (_launchState$value8 = _launchState$value8.metadata) === null || _launchState$value8 === void 0 ? void 0 : _launchState$value8.minStakeAmount,
+          blockletMeta: launch === null || launch === void 0 ? void 0 : launch.blockletMeta
         }), ((_state$productType3 = state.productType) === null || _state$productType3 === void 0 ? void 0 : _state$productType3.name) === 'dedicated' && ((_window$blocklet3 = window.blocklet) === null || _window$blocklet3 === void 0 || (_window$blocklet3 = _window$blocklet3.preferences) === null || _window$blocklet3 === void 0 ? void 0 : _window$blocklet3.dedicatedPricingTableId) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
           sx: {
             display: 'flex',
@@ -338,12 +365,6 @@ function Content(_ref) {
                 marginBottom: 0
               }
             },
-            '& .cko-payment-submit': {
-              marginTop: 0,
-              '& button': {
-                fontSize: '1rem !important'
-              }
-            },
             '& .btn-row': {
               justifyContent: 'center !important'
             }
@@ -364,24 +385,6 @@ function Content(_ref) {
             })
           })
         })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-        sx: {
-          display: 'flex',
-          justifyContent: 'space-between'
-        },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-          component: _reactRouterDom.Link,
-          sx: {
-            color: 'text.secondary',
-            marginTop: '24px',
-            marginBottom: isMobile ? '64px' : '12px',
-            '&:hover': {
-              textDecoration: 'underline !important'
-            }
-          },
-          to: (0, _urlJoin.default)(routerPrefix, "/purchase/select".concat(window.location.search)),
-          children: t('purchase.selectSpaceHint')
-        })
       })]
     })
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.3.117",
+  "version": "2.3.118",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -41,22 +41,22 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.13.29",
-    "@arcblock/icons": "^2.13.29",
-    "@arcblock/license": "^2.13.29",
-    "@arcblock/react-hooks": "^2.13.29",
-    "@arcblock/ux": "^2.13.29",
-    "@blocklet/launcher-layout": "^2.13.29",
-    "@blocklet/launcher-util": "2.3.117",
-    "@blocklet/launcher-ux": "2.3.117",
+    "@arcblock/did-connect": "^2.13.35",
+    "@arcblock/icons": "^2.13.35",
+    "@arcblock/license": "^2.13.35",
+    "@arcblock/react-hooks": "^2.13.35",
+    "@arcblock/ux": "^2.13.35",
+    "@blocklet/launcher-layout": "^2.13.35",
+    "@blocklet/launcher-util": "2.3.118",
+    "@blocklet/launcher-ux": "2.3.118",
     "@blocklet/payment": "^1.14.8",
-    "@blocklet/payment-react": "^1.18.40",
+    "@blocklet/payment-react": "^1.18.43",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
     "@mui/icons-material": "^5.17.1",
     "@mui/lab": "^5.0.0-alpha.176",
     "@mui/material": "^5.17.1",
-    "@ocap/util": "^1.20.8",
+    "@ocap/util": "^1.20.10",
     "@splidejs/react-splide": "^0.7.12",
     "@splidejs/splide": "^4.1.4",
     "@splidejs/splide-extension-grid": "^0.4.1",
@@ -106,5 +106,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "574800ae19119a0c13ed2c4cc44104e1add1870b"
+  "gitHead": "76af82cb00a4d6d95dc5e046e8982375f38e65a1"
 }