@blocklet/launcher-layout 2.10.58 → 2.10.60

package/lib/header.js

@@ -1,5 +1,4 @@
 import Img from '@arcblock/ux/lib/Img';
-import { getBlockletDisplayName } from '@blocklet/launcher-util/es/util';
 import styled from '@emotion/styled';
 import { Skeleton, useMediaQuery } from '@mui/material';
 import isEmpty from 'is-empty';
@@ -9,6 +8,7 @@ import joinUrl from 'url-join';
 import defaultBlockletLogo from './assets/blocklet-default-logo.png';
 import { getLaunchingText } from './locale';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const getBlockletDisplayName = blocklet => blocklet?.title || blocklet?.name || '';
 function AppHeader({
   blockletMeta,
   subTitle,

package/lib/index.js

@@ -1,9 +1,8 @@
 import Center from '@arcblock/ux/lib/Center';
 import { create } from '@arcblock/ux/lib/Theme';
-import SmallCircleProgress from '@blocklet/launcher-ux/lib/small-circle-progress';
-import styled from '@emotion/styled';
 import { ThemeProvider as EmotionThemeProvider } from '@emotion/react';
-import { Typography, useMediaQuery, StyledEngineProvider, ThemeProvider, Hidden, CircularProgress } from '@mui/material';
+import styled from '@emotion/styled';
+import { CircularProgress, Hidden, StyledEngineProvider, ThemeProvider, Typography, useMediaQuery } from '@mui/material';
 import isObject from 'lodash/isObject';
 import PropTypes from 'prop-types';
 import { Suspense, isValidElement } from 'react';
@@ -11,6 +10,7 @@ import { useStepContext } from './context/step';
 import AppHeader from './header';
 import { getTranslations } from './locale';
 import Nav from './nav';
+import SmallCircleProgress from './small-circle-progress';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const HEADER_HEIGHT_MD = '72px';
 const MobileContent = styled.div`

package/lib/small-circle-progress.js

@@ -0,0 +1,57 @@
+import PropTypes from 'prop-types';
+import styled from '@emotion/styled';
+import CircularProgress from '@mui/material/CircularProgress';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export default function SmallCircleProgress({
+  value,
+  size,
+  style,
+  ...rest
+}) {
+  return /*#__PURE__*/_jsxs(Content, {
+    style: {
+      width: size,
+      height: size,
+      ...style
+    },
+    ...rest,
+    children: [/*#__PURE__*/_jsx(CircularProgress, {
+      variant: "determinate",
+      role: "progressbar",
+      value: 100,
+      size: size,
+      "aria-label": "decorative progress bar",
+      thickness: 10,
+      style: {
+        color: '#dddddd'
+      }
+    }), /*#__PURE__*/_jsx(CircularProgress, {
+      variant: "determinate",
+      value: value,
+      role: "progressbar",
+      size: size,
+      thickness: 10,
+      "aria-label": "main progress bar"
+    })]
+  });
+}
+SmallCircleProgress.propTypes = {
+  value: PropTypes.number.isRequired,
+  size: PropTypes.number,
+  style: PropTypes.object
+};
+SmallCircleProgress.defaultProps = {
+  size: 10,
+  style: {}
+};
+const Content = styled.span`
+  display: inline-block;
+  position: relative;
+  > * {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+  }
+`;

package/lib/wizard/hotkey-submit.js

@@ -0,0 +1,39 @@
+import { useEffect } from 'react';
+import PropTypes from 'prop-types';
+
+/**
+ * This component should be used only once in each page,
+ * otherwise all registered events will be triggered when the user presses the Meta(Ctrl)+Enter key combination,
+ * which may not be consistent with the actual business logic.
+ */
+export default function SubmitHotKey({
+  disabled,
+  children,
+  onConfirm
+}) {
+  useEffect(() => {
+    if (disabled) {
+      return () => {};
+    }
+    const listener = event => {
+      if (event.code === 'Enter' && (event.metaKey === true || event.ctrlKey === true)) {
+        event.preventDefault();
+        event.stopPropagation();
+        onConfirm();
+      }
+    };
+    document.addEventListener('keydown', listener);
+    return () => {
+      document.removeEventListener('keydown', listener);
+    };
+  }, [disabled, onConfirm]);
+  return children;
+}
+SubmitHotKey.propTypes = {
+  disabled: PropTypes.bool,
+  children: PropTypes.any.isRequired,
+  onConfirm: PropTypes.func.isRequired
+};
+SubmitHotKey.defaultProps = {
+  disabled: false
+};

package/lib/wizard/server-eula.js

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import { CircularProgress } from '@mui/material';
 import Button from '@arcblock/ux/lib/Button';
 import Dialog from '@arcblock/ux/lib/Dialog';
-import SubmitHotKey from '@blocklet/launcher-ux/lib/hot-key/submit';
+import SubmitHotKey from './hotkey-submit';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 function ServerEula({
   onContinue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-layout",
-  "version": "2.10.58",
+  "version": "2.10.60",
   "description": "Common ux components of launcher",
   "publishConfig": {
     "access": "public"
@@ -44,9 +44,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@arcblock/icons": "^2.10.58",
-    "@blocklet/launcher-util": "2.3.45",
-    "@blocklet/launcher-ux": "2.3.45",
+    "@arcblock/icons": "^2.10.60",
     "@blocklet/meta": "1.16.29",
     "@emotion/react": "^11.13.0",
     "@emotion/styled": "^11.13.0",
@@ -67,5 +65,5 @@
     "babel-plugin-inline-react-svg": "^2.0.2",
     "glob": "^10.4.5"
   },
-  "gitHead": "b6bba35441efe81e5df2833a5ca5fb589ceea55b"
+  "gitHead": "fb4ccbae5428593bc9d7555e832f7743fbd9c71b"
 }