@arcblock/ux 2.4.0 → 2.4.3

package/lib/Wallet/Download.js

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _styled = _interopRequireDefault(require("@emotion/styled"));
-
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 
 var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
@@ -19,6 +17,8 @@ var _Button = _interopRequireDefault(require("../Button"));
 
 var _Util = require("../Util");
 
+var _Theme = require("../Theme");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 var _templateObject;
@@ -336,5 +336,4 @@ WalletDownload.defaultProps = {
   style: {},
   locale: 'zh'
 };
-
-const Container = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: ", ";\n  align-items: center;\n\n  .download-title {\n    margin-right: ", ";\n    margin-bottom: ", ";\n  }\n\n  .download-store-list {\n    display: flex;\n    flex-direction: ", ";\n    justify-content: space-between;\n    align-items: center;\n\n    .download-link {\n      padding: 0;\n      margin: 0;\n\n      margin-right: ", ";\n      margin-bottom: ", ";\n\n      &:last-of-type {\n        margin-right: 0;\n        margin-bottom: 0;\n      }\n    }\n  }\n"])), props => props.layout === 'vertical' ? 'column' : 'row', props => props.layout === 'vertical' ? '0' : '16px', props => props.layout === 'vertical' ? '16px' : '0', props => props.storeLayout === 'vertical' ? 'column' : 'row', props => props.storeLayout === 'vertical' ? '0' : '16px', props => props.storeLayout === 'vertical' ? '16px' : '0');
+const Container = (0, _Theme.styled)('div')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-direction: ", ";\n  align-items: center;\n\n  .download-title {\n    margin-right: ", ";\n    margin-bottom: ", ";\n  }\n\n  .download-store-list {\n    display: flex;\n    flex-direction: ", ";\n    justify-content: space-between;\n    align-items: center;\n\n    .download-link {\n      padding: 0;\n      margin: 0;\n\n      margin-right: ", ";\n      margin-bottom: ", ";\n\n      &:last-of-type {\n        margin-right: 0;\n        margin-bottom: 0;\n      }\n    }\n  }\n"])), props => props.layout === 'vertical' ? 'column' : 'row', props => props.layout === 'vertical' ? '0' : '16px', props => props.layout === 'vertical' ? '16px' : '0', props => props.storeLayout === 'vertical' ? 'column' : 'row', props => props.storeLayout === 'vertical' ? '0' : '16px', props => props.storeLayout === 'vertical' ? '16px' : '0');

package/lib/Wallet/Open.js

@@ -7,12 +7,12 @@ exports.default = OpenInWallet;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _styled = _interopRequireDefault(require("@emotion/styled"));
-
 var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
 
 var _Fab = _interopRequireDefault(require("@mui/material/Fab"));
 
+var _Theme = require("../Theme");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 var _templateObject;
@@ -53,4 +53,4 @@ OpenInWallet.propTypes = {
 OpenInWallet.defaultProps = {
   locale: 'zh'
 };
-const Button = (0, _styled.default)(_Fab.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  && {\n    font-size: 12px;\n    position: fixed;\n    bottom: 24px;\n    left: 50%;\n    transform-origin: 50% 50%;\n    transform: translateX(-50%);\n    min-width: 120px;\n    z-index: ", ";\n  }\n"])), props => props.theme.zIndex.tooltip);
+const Button = (0, _Theme.styled)(_Fab.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  && {\n    font-size: 12px;\n    position: fixed;\n    bottom: 24px;\n    left: 50%;\n    transform-origin: 50% 50%;\n    transform: translateX(-50%);\n    min-width: 120px;\n    z-index: ", ";\n  }\n"])), props => props.theme.zIndex.tooltip);

package/lib/WechatPrompt/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = WechatPrompt;
 
-var _styled = _interopRequireDefault(require("@emotion/styled"));
-
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 
 var _Dialog = _interopRequireDefault(require("@mui/material/Dialog"));
@@ -17,6 +15,8 @@ var _ios = _interopRequireDefault(require("./images/ios.png"));
 
 var _android = _interopRequireDefault(require("./images/android.png"));
 
+var _Theme = require("../Theme");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 var _templateObject;
@@ -81,4 +81,4 @@ function WechatPrompt() {
   });
 }
 
-const Container = _styled.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .wechat-title {\n    height: 80px;\n    line-height: 80px;\n    text-align: center;\n    font-size: 20px;\n    color: #fff;\n    background-color: #9cdbd8;\n  }\n\n  .wechat-tip {\n    display: flex;\n    flex-direction: column;\n    align-items: center;\n\n    .wechat-tip-text {\n      font-size: 20px;\n      padding: 10px 10px;\n      overflow: auto;\n      word-break: break-word;\n      text-align: center;\n    }\n\n    .wechat-tip-img {\n      width: 90%;\n      object-fit: cover;\n    }\n  }\n"])));
+const Container = (0, _Theme.styled)('div')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .wechat-title {\n    height: 80px;\n    line-height: 80px;\n    text-align: center;\n    font-size: 20px;\n    color: #fff;\n    background-color: #9cdbd8;\n  }\n\n  .wechat-tip {\n    display: flex;\n    flex-direction: column;\n    align-items: center;\n\n    .wechat-tip-text {\n      font-size: 20px;\n      padding: 10px 10px;\n      overflow: auto;\n      word-break: break-word;\n      text-align: center;\n    }\n\n    .wechat-tip-img {\n      width: 90%;\n      object-fit: cover;\n    }\n  }\n"])));

package/lib/withTheme/index.js

@@ -5,12 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var React = _interopRequireWildcard(require("react"));
+var _react = require("react");
 
 var _react2 = require("@emotion/react");
 
-var _styles = require("@mui/material/styles");
-
 var _CssBaseline = _interopRequireDefault(require("@mui/material/CssBaseline"));
 
 var _Theme = require("../Theme");
@@ -21,10 +19,6 @@ var _templateObject;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -33,8 +27,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-const globalStyles = (0, _react2.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  font-family: ", ";\n  color: ", ";\n\n  a,\n  a:hover,\n  a:active {\n    text-decoration: none;\n    color: ", ";\n  }\n\n  a:hover {\n    color: ", ";\n  }\n\n  .section--latest-post {\n    p:last-of-type {\n      margin: 0;\n    }\n  }\n\n  .has-scrolled {\n    .section--footnotes {\n      position: static !important;\n      transition-property: background-color;\n      transition-duration: 600ms;\n      transition-timing-function: ease;\n      .footnote__title {\n        color: #fff;\n      }\n    }\n  }\n"])), props => props.theme.typography.fontFamily, props => props.theme.typography.color.main, props => props.theme.palette.primary.dark, props => props.theme.palette.primary.main);
-
 function withTheme(Component) {
   let {
     mode = 'light',
@@ -42,42 +34,28 @@ function withTheme(Component) {
     palette,
     typography
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-  class WithTheme extends React.Component {
-    constructor(props) {
-      super(props);
-      this.theme = (0, _Theme.create)({
-        mode,
-        pageWidth,
-        palette,
-        typography
-      });
-    }
-
-    componentDidMount() {
-      // Remove the server-side injected CSS.
+  const theme = (0, _Theme.createTheme)({
+    mode,
+    pageWidth,
+    palette,
+    typography
+  });
+  const globalStyles = (0, _react2.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    font-family: ", ";\n    color: ", ";\n\n    a,\n    a:hover,\n    a:active {\n      text-decoration: none;\n      color: ", ";\n    }\n\n    a:hover {\n      color: ", ";\n    }\n\n    .section--latest-post {\n      p:last-of-type {\n        margin: 0;\n      }\n    }\n\n    .has-scrolled {\n      .section--footnotes {\n        position: static !important;\n        transition-property: background-color;\n        transition-duration: 600ms;\n        transition-timing-function: ease;\n        .footnote__title {\n          color: #fff;\n        }\n      }\n    }\n  "])), theme.typography.fontFamily, theme.typography.color.main, theme.palette.primary.dark, theme.palette.primary.main);
+  return function WithTheme(props) {
+    (0, _react.useEffect)(() => {
       const jssStyles = document.querySelector('#jss-server-side');
 
       if (jssStyles && jssStyles.parentNode) {
         jssStyles.parentNode.removeChild(jssStyles);
       }
-    }
-
-    render() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.ThemeProvider, {
-        theme: this.theme,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CssBaseline.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Global, {
-          styles: globalStyles
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.ThemeProvider, {
-          theme: this.theme,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread({}, this.props))
-        })]
-      });
-    }
-
-  }
-
-  return WithTheme;
+    }, []);
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Theme.ThemeProvider, {
+      theme: theme,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CssBaseline.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Global, {
+        styles: globalStyles
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread({}, props))]
+    });
+  };
 }
 
 var _default = withTheme;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.4.0",
+  "version": "2.4.3",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,10 +47,10 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "202771a046cab27fc550d31e73588075a90c75fd",
+  "gitHead": "a3c4e62917f630b62edccc064cfbb88e72b8407d",
   "dependencies": {
-    "@arcblock/icons": "^2.4.0",
-    "@arcblock/react-hooks": "^2.4.0",
+    "@arcblock/icons": "^2.4.3",
+    "@arcblock/react-hooks": "^2.4.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.10.0",

package/src/ActivityIndicator/index.js

@@ -1,10 +1,10 @@
 import { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
 import { green, blue } from '@mui/material/colors';
 
 import Logo from '../Logo';
 import colors from '../Colors';
+import { styled } from '../Theme';
 
 /**
  * ActivityIndicator is used when we want to tell the user the request they made on the UI will take time.
@@ -49,7 +49,7 @@ ActivityIndicator.defaultProps = {
   messages: ['Loading data...'],
 };
 
-const Div = styled.div`
+const Div = styled('div')`
   && {
     box-sizing: border-box;
     padding: 20px;
@@ -112,7 +112,7 @@ Orbit.defaultProps = {
   duration: 2,
 };
 
-const OrbitRoot = styled.div`
+const OrbitRoot = styled('div')`
   @keyframes orbit {
     0% {
       transform: rotate(0deg);

package/src/Alert/index.js

@@ -1,11 +1,11 @@
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
 import Typography from '@mui/material/Typography';
 import { blueGrey } from '@mui/material/colors';
 
 import Icon from '../Icon';
 import { mergeProps } from '../Util';
 import colors from '../Colors';
+import { styled } from '../Theme';
 
 const types = {
   error: {
@@ -74,7 +74,7 @@ Alert.defaultProps = {
 
 export default Alert;
 
-const Container = styled.div`
+const Container = styled('div')`
   display: flex;
   align-items: center;
   font-size: 16px;

package/src/AnimationWaiter/index.js

@@ -1,8 +1,9 @@
 import { useState, useEffect, useRef } from 'react';
-import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
 import Lottie from 'react-lottie-player';
+
 import lottieJson from './default-animation.json';
+import { styled } from '../Theme';
 
 /**
  * 用于长时间等待的用的动画组件
@@ -191,7 +192,7 @@ AnimationWaiter.defaultProps = {
   increaseSpeed: 0,
 };
 
-const Container = styled.div`
+const Container = styled('div')`
   display: flex;
   justify-content: center;
   align-items: center;

package/src/Badge/index.js

@@ -1,11 +1,10 @@
 import { forwardRef } from 'react';
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
-
 import Typography from '@mui/material/Typography';
 
 import colors from '../Colors';
 import { mergeProps } from '../Util';
+import { styled } from '../Theme';
 
 const types = {
   error: {

package/src/Blocklet/blocklet.js

@@ -1,15 +1,14 @@
-import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
 import Typography from '@mui/material/Typography';
 import CircularProgress from '@mui/material/CircularProgress';
 import Avatar from '@arcblock/did-connect/lib/Avatar';
-import { useTheme } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 
 import Button from '../Button';
 import Img from '../Img';
+import { useTheme, styled } from '../Theme';
 
-const Div = styled.div`
+const Div = styled('div')`
   &.arcblock-blocklet {
     padding: ${(props) => props.theme.spacing(2)} ${(props) => props.theme.spacing(2)} 0
       ${(props) => props.theme.spacing(2)};

package/src/Blocklet/utils.js

@@ -1,6 +1,6 @@
-import styled from '@emotion/styled';
+import { styled } from '../Theme';
 
-const ActionButton = styled.div`
+const ActionButton = styled('div')`
   background-color: transparent !important;
   & > :not(.Mui-disabled) {
     position: relative;

package/src/BlockletNFT/index.js

@@ -1,16 +1,15 @@
 import { useRef } from 'react';
-import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
 import Portal from '@mui/material/Portal';
 import Typography from '@mui/material/Typography';
 import CircularProgress from '@mui/material/CircularProgress';
 import useMediaQuery from '@mui/material/useMediaQuery';
-import { useTheme } from '@mui/material/styles';
 import Avatar from '@arcblock/did-connect/lib/Avatar';
 
 import Icon from '../Icon';
 import Button from '../Button';
 import Img from '../Img';
+import { useTheme, styled } from '../Theme';
 
 /**
  * 美化数字 1000-->1k
@@ -29,7 +28,7 @@ function prettySize(_size, digits = 1) {
   return _size && `${size}${list[index]}`;
 }
 
-const Div = styled.div`
+const Div = styled('div')`
   &.arcblock-blocklet {
     padding: 0 16px;
     background: ${(props) => props.theme.palette.common.white};

package/src/Center/index.js

@@ -1,6 +1,7 @@
-import styled from '@emotion/styled';
 import PropTypes from 'prop-types';
 
+import { styled } from '../Theme';
+
 /**
  *
  * @param {string} relative 容器相对尺寸，默认相对屏幕(screen)，可设置为父容器(parent)
@@ -19,7 +20,7 @@ export default function Center({ children, relative }) {
   return <Div style={style}>{children}</Div>;
 }
 
-const Div = styled.div`
+const Div = styled('div')`
   flex: 1;
   width: 100vw;
   height: 100vh;

package/src/ClickToCopy/index.js

@@ -2,10 +2,11 @@ import PropTypes from 'prop-types';
 import useWindowSize from 'react-use/lib/useWindowSize';
 import Tooltip from '@mui/material/Tooltip';
 import Typography from '@mui/material/Typography';
-import styled from '@emotion/styled';
+
 import useCopy from './hook';
 import Toast, { ToastProvider } from '../Toast';
 import { mergeProps } from '../Util';
+import { styled } from '../Theme';
 
 export { default as CopyButton } from './copy-button';
 

package/src/CodeBlock/index.js

@@ -1,7 +1,6 @@
 /* eslint-disable react/no-danger */
 import { useState } from 'react';
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
 import Copy from 'copy-to-clipboard';
 import Button from '@mui/material/IconButton';
 import useMountedState from 'react-use/lib/useMountedState';
@@ -27,6 +26,7 @@ import 'highlight.js/styles/atom-one-dark.css';
 import CopyIcon from '@mui/icons-material/FileCopy';
 import CheckIcon from '@mui/icons-material/Check';
 import colors from '../Colors';
+import { styled } from '../Theme';
 
 hljs.registerLanguage('javascript', javascript);
 hljs.registerLanguage('js', javascript);
@@ -100,7 +100,7 @@ CodeBlock.defaultProps = {
 };
 
 const fontFamily = 'source-code-pro, Menlo, Monaco, Consolas, Courier New, monospace !important';
-const Pre = styled.pre`
+const Pre = styled('pre')`
   font-family: ${fontFamily};
   display: block;
   font-size: 14px;

package/src/ContactForm/index.js

@@ -2,14 +2,13 @@
 /* eslint-disable react/static-property-placement */
 import React from 'react';
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
 import axios from 'axios';
-
 import Typography from '@mui/material/Typography';
 import CircularProgress from '@mui/material/CircularProgress';
 
 import { mergeProps } from '../Util';
 import Button from '../Button';
+import { styled } from '../Theme';
 
 export async function submitContactForm({ formId, portalId }, fields, context) {
   const url = `https://api.hsforms.com/submissions/v3/integration/submit/${portalId}/${formId}`;
@@ -188,7 +187,7 @@ export default class ContactForm extends React.Component {
 // prettier-ignore
 const getInputWidth = props => (props.layout === 'vertical' ? '100%' : `${Math.max(95 / (props.fieldCount + 1), 20)}%`);
 
-const Form = styled.form`
+const Form = styled('form')`
   display: flex;
   flex-direction: column;
   justify-content: center;

package/src/CookieConsent/index.js

@@ -1,8 +1,9 @@
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
 import Button from '@mui/material/Button';
 import CookieConsent, { resetCookieConsentValue } from 'react-cookie-consent';
 
+import { styled } from '../Theme';
+
 export { resetCookieConsentValue };
 
 const translations = {
@@ -59,7 +60,7 @@ DefaultCookieConsent.defaultProps = {
   locale: 'en',
 };
 
-const Wrapper = styled.div`
+const Wrapper = styled('div')`
   box-sizing: border-box;
   position: fixed;
   right: 20px;

package/src/CountDown/index.js

@@ -1,8 +1,8 @@
 import { Component } from 'react';
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
 
 import { getColor, mergeProps } from '../Util';
+import { styled } from '../Theme';
 
 const SECONDS_OF_MINUTE = 60;
 const SECONDS_OF_HOUR = 60 * SECONDS_OF_MINUTE;
@@ -99,7 +99,7 @@ CountDown.defaultProps = {
 const textBackground = `linear-gradient(to bottom, rgba(0, 0, 0, 0.4), rgba(0, 0, 0, 0.4)),
 linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.5) 77%, rgba(0, 0, 0, 0.5))`;
 
-const Container = styled.div`
+const Container = styled('div')`
   color: ${(props) => getColor(props)};
   font-size: 50px;
   display: flex;

package/src/Datatable/CustomToolbar.js

@@ -1,7 +1,6 @@
 import { useState, useRef, useEffect, isValidElement } from 'react';
 import PropTypes from 'prop-types';
 import { TableFilter, TableViewCol } from 'mui-datatables';
-import styled from '@emotion/styled';
 import ReactToPrint, { PrintContextConsumer } from 'react-to-print';
 import IconButton from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
@@ -16,11 +15,11 @@ import MenuItem from '@mui/material/MenuItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 import useMediaQuery from '@mui/material/useMediaQuery';
-import { useTheme } from '@mui/material/styles';
 import LinearProgress from '@mui/material/LinearProgress';
 import { handleCSVDownload } from './utils';
 import TableSearch from './TableSearch';
 import { useDatatableContext } from './DatatableContext';
+import { styled, useTheme } from '../Theme';
 
 function useMobile() {
   const theme = useTheme();
@@ -351,7 +350,7 @@ CustomToolbar.defaultProps = {
   searchText: null,
 };
 
-const Container = styled.div`
+const Container = styled('div')`
   display: flex;
   align-items: center;
   height: 56px;
@@ -413,7 +412,7 @@ const Container = styled.div`
   }
 `;
 
-const ProgressContainer = styled.div`
+const ProgressContainer = styled('div')`
   width: 100%;
   height: 2px;
   .toolbar-progress {

package/src/Datatable/TableSearch.js

@@ -5,9 +5,9 @@ import Tooltip from '@mui/material/Tooltip';
 import SearchIcon from '@mui/icons-material/Search';
 import TextField from '@mui/material/TextField';
 import ClearIcon from '@mui/icons-material/Clear';
-import styled from '@emotion/styled';
 import clsx from 'clsx';
 import { useDatatableContext } from './DatatableContext';
+import { styled } from '../Theme';
 
 export default function TableSearch({ search, options, searchText, searchTextUpdate, searchClose, onSearchOpen }) {
   const { searchOpen, searchPlaceholder, searchAlwaysOpen } = options;
@@ -113,7 +113,7 @@ TableSearch.defaultProps = {
   onSearchOpen: () => {},
 };
 
-const Container = styled.div`
+const Container = styled('div')`
   display: flex;
   align-items: center;
   .toolbar-search-area {

package/src/Datatable/index.js

@@ -2,7 +2,6 @@
 import { useEffect, useRef, isValidElement } from 'react';
 import PropTypes from 'prop-types';
 import MUIDataTable, { TableFilterList, TableFooter } from 'mui-datatables';
-import styled from '@emotion/styled';
 import { css } from '@emotion/react';
 import isObject from 'lodash/isObject';
 import cloneDeep from 'lodash/cloneDeep';
@@ -12,6 +11,7 @@ import Empty from '../Empty';
 import Spinner from '../Spinner';
 import CustomToolbar from './CustomToolbar';
 import { DatatableProvider, useDatatableContext } from './DatatableContext';
+import { styled } from '../Theme';
 
 export default function Datatable({ ...props }) {
   return (
@@ -382,7 +382,7 @@ const alignCss = css`
   }
 `;
 
-const TableContainer = styled.div`
+const TableContainer = styled('div')`
   &.datatable-hide-header {
     thead.MuiTableHead-root {
       display: none;
@@ -474,7 +474,7 @@ const TableContainer = styled.div`
   }
 `;
 
-const FilterLine = styled.div`
+const FilterLine = styled('div')`
   display: flex;
   align-items: center;
   .toolbar-filter-content {
@@ -522,7 +522,7 @@ function WrapTableFooter(props) {
   );
 }
 
-const FooterContainer = styled.div`
+const FooterContainer = styled('div')`
   display: flex;
   align-items: center;
   .datatable-footer {

package/src/Dialog/dialog.js

@@ -1,13 +1,13 @@
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
 import MuiDialog from '@mui/material/Dialog';
 import MuiDialogContent from '@mui/material/DialogContent';
 import DialogActions from '@mui/material/DialogActions';
 import IconButton from '@mui/material/IconButton';
 import useMediaQuery from '@mui/material/useMediaQuery';
-import { useTheme } from '@mui/material/styles';
 import CloseIcon from '@mui/icons-material/Close';
 
+import { styled, useTheme } from '../Theme';
+
 /**
  * Dialog
  *
@@ -108,7 +108,7 @@ const StyledMuiDialog = styled(MuiDialog)`
   }
 `;
 
-const Header = styled.div`
+const Header = styled('div')`
   display: flex;
   justify-content: space-between;
   align-items: center;

package/src/Earth/index.js

@@ -2,13 +2,13 @@
 import { useReducer, useRef, useEffect } from 'react';
 import useSpring from 'react-use/lib/useSpring';
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
 import * as d3 from 'd3-geo';
 import * as topojson from 'topojson-client';
 import versor from 'versor';
 
 import json from './countries.json';
 import util from './util';
+import { styled } from '../Theme';
 
 const geoJson = topojson.feature(json, json.objects.ne_110m_admin_0_countries);
 const themes = {
@@ -371,7 +371,7 @@ Earth.defaultProps = {
   colors: {},
 };
 
-const Container = styled.div`
+const Container = styled('div')`
   background-color: ${(props) => (props.theme === 'light' ? '#f7f7f7' : '#222')};
   width: ${(props) => props.width}px;
   height: ${(props) => props.height}px;
@@ -454,7 +454,7 @@ const Container = styled.div`
   }
 `;
 
-const Tooltip = styled.div`
+const Tooltip = styled('div')`
   position: absolute;
   width: auto;
   min-width: 90px;

package/src/Empty/index.js

@@ -1,8 +1,9 @@
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
+
 import Icon from '../Icon';
+import { styled } from '../Theme';
 
-const Wrapper = styled.div`
+const Wrapper = styled('div')`
   display: flex;
   justify-content: center;
   align-items: center;

package/src/ErrorBoundary/fallback.js

@@ -1,8 +1,7 @@
 import PropTypes from 'prop-types';
-import styled from '@emotion/styled';
-import { useTheme } from '@mui/material/styles';
 import { red } from '@mui/material/colors';
 import Button from '../Button';
+import { styled, useTheme } from '../Theme';
 
 function InternalErrorFallback({ title, desc, retryFunc }) {
   const theme = useTheme();
@@ -46,7 +45,7 @@ ErrorFallbackRetry.propTypes = {
   resetErrorBoundary: PropTypes.func.isRequired,
 };
 
-const Root = styled.div`
+const Root = styled('div')`
   padding: 16px;
   border: 2px solid ${(props) => props.$theme.palette.error.main};
   border-radius: 4px;