@blocklet/launcher-layout 2.1.87 → 2.1.88

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.
Files changed (2) hide show
  1. package/lib/index.js +65 -57
  2. package/package.json +4 -4
package/lib/index.js CHANGED
@@ -10,11 +10,12 @@ var _smallCircleProgress = _interopRequireDefault(require("@blocklet/launcher-ux
10
10
  var _styled = _interopRequireDefault(require("@emotion/styled"));
11
11
  var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
12
12
  var _Hidden = _interopRequireDefault(require("@mui/material/Hidden"));
13
+ var _react = require("@emotion/react");
13
14
  var _styles = require("@mui/material/styles");
14
15
  var _useMediaQuery = _interopRequireDefault(require("@mui/material/useMediaQuery"));
15
16
  var _isObject = _interopRequireDefault(require("lodash/isObject"));
16
17
  var _propTypes = _interopRequireDefault(require("prop-types"));
17
- var _react = require("react");
18
+ var _react2 = require("react");
18
19
  var _step = require("./context/step");
19
20
  var _header = _interopRequireDefault(require("./header"));
20
21
  var _locale = require("./locale");
@@ -75,7 +76,7 @@ function Layout(_ref) {
75
76
  } = (0, _step.useStepContext)();
76
77
  const Container = isMobile ? MobileContent : PcContent;
77
78
  const translations = (0, _locale.getTranslations)(locale);
78
- if (navLogo && ! /*#__PURE__*/(0, _react.isValidElement)(navLogo) && (0, _isObject.default)(navLogo)) {
79
+ if (navLogo && ! /*#__PURE__*/(0, _react2.isValidElement)(navLogo) && (0, _isObject.default)(navLogo)) {
79
80
  if (isMobile) {
80
81
  // eslint-disable-next-line no-param-reassign
81
82
  navLogo = navLogo.mobile;
@@ -86,65 +87,72 @@ function Layout(_ref) {
86
87
  });
87
88
  }
88
89
  }
89
- return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.ThemeProvider, {
90
- theme: Object.assign(theme, userTheme || {}),
91
- children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(Root, _objectSpread(_objectSpread({}, rest), {}, {
92
- children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(Header, {
93
- maxWidth: contentMaxWidth,
94
- width: pcWidth,
95
- children: [header && header, !header && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
96
- children: [isMobile && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
97
- className: "left",
98
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_header.default, {
99
- blockletMeta: blockletMeta,
100
- navLogo: navLogo,
101
- subTitle: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
102
- children: ["".concat(navSubTitle || translations.defaultNavSubTitle, " ").concat(activeStep + 1, "/").concat(totalStepsCount), /*#__PURE__*/(0, _jsxRuntime.jsx)(_smallCircleProgress.default, {
103
- value: (activeStep + 1) / totalStepsCount * 100,
90
+ const tempTheme = Object.assign(theme, userTheme || {});
91
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.StyledEngineProvider, {
92
+ injectFirst: true,
93
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.ThemeProvider, {
94
+ theme: tempTheme,
95
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.ThemeProvider, {
96
+ theme: tempTheme,
97
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(Root, _objectSpread(_objectSpread({}, rest), {}, {
98
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(Header, {
99
+ maxWidth: contentMaxWidth,
100
+ width: pcWidth,
101
+ children: [header && header, !header && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
102
+ children: [isMobile && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
103
+ className: "left",
104
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_header.default, {
105
+ blockletMeta: blockletMeta,
106
+ navLogo: navLogo,
107
+ subTitle: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
108
+ children: ["".concat(navSubTitle || translations.defaultNavSubTitle, " ").concat(activeStep + 1, "/").concat(totalStepsCount), /*#__PURE__*/(0, _jsxRuntime.jsx)(_smallCircleProgress.default, {
109
+ value: (activeStep + 1) / totalStepsCount * 100,
110
+ style: {
111
+ marginLeft: 3
112
+ }
113
+ })]
114
+ }),
115
+ logoUrl: logoUrl,
116
+ locale: locale,
117
+ loading: loading
118
+ })
119
+ }), navLogo && !isMobile && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
120
+ className: "left",
121
+ children: navLogo
122
+ }), headerEndAddons && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
123
+ className: "right",
124
+ children: headerEndAddons
125
+ })]
126
+ })]
127
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, {
128
+ contentMaxWidth: contentMaxWidth,
129
+ width: pcWidth,
130
+ height: pcHeight,
131
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Hidden.default, {
132
+ mdDown: true,
133
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_nav.default, {
134
+ locale: locale,
135
+ blockletMeta: blockletMeta,
136
+ logoUrl: logoUrl,
137
+ useOfSkeleton: useOfSkeleton,
138
+ subTitle: navSubTitle,
139
+ loading: loading
140
+ })
141
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Suspense, {
142
+ fallback: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Center.default, {
143
+ relative: "parent",
144
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
104
145
  style: {
105
- marginLeft: 3
146
+ marginTop: 36
106
147
  }
107
- })]
148
+ })
108
149
  }),
109
- logoUrl: logoUrl,
110
- locale: locale,
111
- loading: loading
112
- })
113
- }), navLogo && !isMobile && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
114
- className: "left",
115
- children: navLogo
116
- }), headerEndAddons && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
117
- className: "right",
118
- children: headerEndAddons
150
+ children: children
151
+ })]
119
152
  })]
120
- })]
121
- }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, {
122
- contentMaxWidth: contentMaxWidth,
123
- width: pcWidth,
124
- height: pcHeight,
125
- children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Hidden.default, {
126
- mdDown: true,
127
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_nav.default, {
128
- locale: locale,
129
- blockletMeta: blockletMeta,
130
- logoUrl: logoUrl,
131
- useOfSkeleton: useOfSkeleton,
132
- subTitle: navSubTitle,
133
- loading: loading
134
- })
135
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
136
- fallback: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Center.default, {
137
- relative: "parent",
138
- children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
139
- style: {
140
- marginTop: 36
141
- }
142
- })
143
- }),
144
- children: children
145
- })]
146
- })]
147
- }))
153
+ }))
154
+ })
155
+ })
148
156
  });
149
157
  }
150
158
  Layout.propTypes = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blocklet/launcher-layout",
3
- "version": "2.1.87",
3
+ "version": "2.1.88",
4
4
  "description": "Common ux components of launcher",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -39,8 +39,8 @@
39
39
  "@arcblock/did-connect": "^2.6.7",
40
40
  "@arcblock/icons": "^2.6.7",
41
41
  "@arcblock/ux": "^2.6.7",
42
- "@blocklet/launcher-util": "2.1.87",
43
- "@blocklet/launcher-ux": "2.1.87",
42
+ "@blocklet/launcher-util": "2.1.88",
43
+ "@blocklet/launcher-ux": "2.1.88",
44
44
  "@blocklet/meta": "^1.16.13",
45
45
  "@emotion/react": "^11.11.1",
46
46
  "@emotion/styled": "^11.11.0",
@@ -60,5 +60,5 @@
60
60
  "@storybook/react": "^6.5.16",
61
61
  "babel-plugin-inline-react-svg": "^2.0.2"
62
62
  },
63
- "gitHead": "2449eebc1d6a3689dfb2d3ee899cb61d5445779d"
63
+ "gitHead": "cfd7e3997efa326d8e9e5c48422f6c530e4a5ef4"
64
64
  }