@blocklet/launcher-layout 1.7.57 → 1.7.60

package/lib/index.js

@@ -15,12 +15,12 @@ var _Hidden = _interopRequireDefault(require("@mui/material/Hidden"));
 
 var _useMediaQuery = _interopRequireDefault(require("@mui/material/useMediaQuery"));
 
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
-
 var _Center = _interopRequireDefault(require("@arcblock/ux/lib/Center"));
 
 var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 
+var _smallCircleProgress = _interopRequireDefault(require("@blocklet/launcher-ux/lib/small-circle-progress"));
+
 var _isObject = _interopRequireDefault(require("lodash/isObject"));
 
 var _step = require("./context/step");
@@ -90,26 +90,11 @@ function Layout(_ref) {
           }),
           navLogo: navLogo,
           subTitle: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-            children: ["".concat(stepTip || translations.stepTip, " ").concat(activeStep + 1, "/").concat(totalStepsCount), /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-              className: "circular",
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-                variant: "determinate",
-                role: "progressbar",
-                value: 100,
-                size: 10,
-                "aria-label": "decorative progress bar",
-                thickness: 10,
-                style: {
-                  color: '#dddddd'
-                }
-              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-                variant: "determinate",
-                value: (activeStep + 1) / totalStepsCount * 100,
-                role: "progressbar",
-                size: 10,
-                thickness: 10,
-                "aria-label": "main progress bar"
-              })]
+            children: ["".concat(stepTip || translations.stepTip, " ").concat(activeStep + 1, "/").concat(totalStepsCount), /*#__PURE__*/(0, _jsxRuntime.jsx)(_smallCircleProgress.default, {
+              value: (activeStep + 1) / totalStepsCount * 100,
+              style: {
+                marginLeft: 3
+              }
             })]
           }),
           logoUrl: logoUrl,
@@ -139,7 +124,11 @@ function Layout(_ref) {
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
         fallback: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Center.default, {
           relative: "parent",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+            style: {
+              marginTop: 36
+            }
+          })
         }),
         children: children
       })]

package/lib/nav.js

@@ -87,7 +87,6 @@ function Nav(_ref) {
   };
 
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
-    className: "nav-sidebar",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_header.default, {
       title: /*#__PURE__*/(0, _jsxRuntime.jsx)(AppLink, {
         target: "_blank",
@@ -178,7 +177,7 @@ const AppLink = _styledComponents.default.a.withConfig({
 const Div = _styledComponents.default.div.withConfig({
   displayName: "nav__Div",
   componentId: "sc-1qwhj4c-1"
-})(["overflow-y:auto;", "{padding:24px;border-right:1px solid ", ";width:30%;min-width:260px;min-height:48px;.MuiStepConnector-vertical{padding:0;}}", "{padding:16px;.MuiStepConnector-lineVertical{border:none;}}.stepper{padding:0 !important;background:transparent;", "{margin-top:100px;}", "{margin-top:40px;}.step{cursor:pointer;}}.always-step-child{.step-child-block{animation:none !important;}}"], props => props.theme.breakpoints.up('md'), props => props.theme.palette.grey[100], props => props.theme.breakpoints.down('md'), props => props.theme.breakpoints.up('sm'), props => props.theme.breakpoints.down('md'));
+})(["overflow-y:auto;", "{padding:24px;border-right:1px solid ", ";flex:0 0 280px;min-height:48px;.MuiStepConnector-vertical{padding:0;}}", "{padding:16px;.MuiStepConnector-lineVertical{border:none;}}.stepper{padding:0 !important;background:transparent;", "{margin-top:100px;}", "{margin-top:40px;}.step{cursor:pointer;}}.always-step-child{.step-child-block{animation:none !important;}}"], props => props.theme.breakpoints.up('md'), props => props.theme.palette.grey[100], props => props.theme.breakpoints.down('md'), props => props.theme.breakpoints.up('sm'), props => props.theme.breakpoints.down('md'));
 
 const StepContainer = _styledComponents.default.div.withConfig({
   displayName: "nav__StepContainer",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-layout",
-  "version": "1.7.57",
+  "version": "1.7.60",
   "description": "Common ux components of launcher",
   "publishConfig": {
     "access": "public"
@@ -37,9 +37,10 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.1.57",
-    "@arcblock/icons": "^2.1.57",
-    "@arcblock/ux": "^2.1.57",
+    "@arcblock/did-connect": "^2.1.58",
+    "@arcblock/icons": "^2.1.58",
+    "@arcblock/ux": "^2.1.58",
+    "@blocklet/launcher-ux": "1.7.60",
     "@blocklet/meta": "^1.8.2",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
@@ -62,5 +63,5 @@
     "babel-plugin-inline-react-svg": "^2.0.1",
     "babel-plugin-styled-components": "^1.10.7"
   },
-  "gitHead": "86ae4c7bb91246906defdda87d745b9d01afd803"
+  "gitHead": "093733960aa7d6341e636716d70f0075d6690617"
 }