npm - @blocklet/list - Versions diffs - 0.8.65 → 0.9.1 - Mend

@blocklet/list 0.8.65 → 0.9.1

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 (7) hide show

package/lib/base.js +50 -42
package/lib/components/aside.js +1 -1
package/lib/components/filter/custom-chip.js +1 -0
package/package.json +16 -16
package/src/base.js +46 -37
package/src/components/aside.js +3 -0
package/src/components/filter/custom-chip.js +1 -1

package/lib/base.js CHANGED Viewed

@@ -62,52 +62,54 @@ function ListBase() {
       mdDown: true,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_aside.default, {})
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(StyledMin, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-        className: "filter-bar",
-        display: "flex",
-        alignItems: "center",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(StyledSearch, {
-          className: "search-container",
-          placeholder: t('common.searchStore')
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(FilterContainer, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+          className: "filter-bar",
+          display: "flex",
+          alignItems: "center",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(StyledSearch, {
+            className: "search-container",
+            placeholder: t('common.searchStore')
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+            mt: 0,
+            ml: "16px",
+            className: "filter-container",
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Hidden, {
+              mdUp: true,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_filter2.FilterIcon, {})
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_customSelect.default, {
+              value: filters.sortBy,
+              options: sortOptions,
+              title: sortLocale,
+              icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Sort.default, {}),
+              onChange: v => {
+                handleSort(v);
+              }
+            })]
+          })]
         }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-          mt: 0,
-          ml: "16px",
-          className: "filter-container",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Hidden, {
-            mdUp: true,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_filter2.FilterIcon, {})
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_customSelect.default, {
-            value: filters.sortBy,
-            options: sortOptions,
-            title: sortLocale,
-            icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Sort.default, {}),
-            onChange: v => {
-              handleSort(v);
+          display: "flex",
+          flexWrap: "wrap",
+          alignItems: "center",
+          mb: "16px",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_filter2.CustomChip, {
+            label: developerName,
+            icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Face.default, {}),
+            onDelete: () => {
+              handleDeveloper(null);
+            }
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_filter2.CustomChip, {
+            label: categoryLocale,
+            onDelete: () => {
+              handleCategory(null);
+            }
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_filter2.CustomChip, {
+            label: priceLocale,
+            onDelete: () => {
+              handlePrice(null);
             }
           })]
         })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-        display: "flex",
-        flexWrap: "wrap",
-        alignItems: "center",
-        mb: "16px",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_filter2.CustomChip, {
-          label: developerName,
-          icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Face.default, {}),
-          onDelete: () => {
-            handleDeveloper(null);
-          }
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_filter2.CustomChip, {
-          label: categoryLocale,
-          onDelete: () => {
-            handleCategory(null);
-          }
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_filter2.CustomChip, {
-          label: priceLocale,
-          onDelete: () => {
-            handlePrice(null);
-          }
-        })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactErrorBoundary.ErrorBoundary, {
         FallbackComponent: _ErrorBoundary.ErrorFallback,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -134,5 +136,11 @@ const StyledSearch = (0, _styledComponents.default)(_search.default).withConfig(
   displayName: "base__StyledSearch",
   componentId: "sc-wumzlv-1"
 })(["background-color:", ";"], props => props.theme.palette.grey[50]);
+const FilterContainer = _styledComponents.default.div.withConfig({
+  displayName: "base__FilterContainer",
+  componentId: "sc-wumzlv-2"
+})(["position:sticky;top:0;z-index:999;background-color:white;"]);
 var _default = ListBase;
 exports.default = _default;

package/lib/components/aside.js CHANGED Viewed

@@ -50,7 +50,7 @@ function Aside() {
 const StyledAside = _styledComponents.default.aside.withConfig({
   displayName: "aside__StyledAside",
   componentId: "sc-1wkvsv6-0"
-})(["width:220px;margin-right:", ";height:100%;overflow-y:auto;"], props => props.theme.spacing(2));
+})(["width:220px;margin-right:", ";height:100%;position:sticky;top:0;overflow-y:auto;z-index:999;"], props => props.theme.spacing(2));
 Aside.propTypes = {};
 Aside.defaultProps = {};

package/lib/components/filter/custom-chip.js CHANGED Viewed

@@ -43,6 +43,7 @@ function FilterChip(_ref) {
   if (!label) return null;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(StyleDiv, _objectSpread(_objectSpread({}, containerProps), {}, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
+      color: "primary",
       "data-cy": "filter-tag",
       icon: icon,
       label: label,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/list",
-  "version": "0.8.65",
+  "version": "0.9.1",
   "description": "Common ux components of blocklet",
   "publishConfig": {
     "access": "public"
@@ -38,15 +38,15 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/ux": "^2.1.71",
-    "@emotion/react": "^11.9.0",
-    "@emotion/styled": "^11.8.1",
-    "@mui/icons-material": "^5.6.2",
-    "ahooks": "^2.10.12",
+    "@arcblock/ux": "^2.2.0",
+    "@emotion/react": "^11.10.0",
+    "@emotion/styled": "^11.10.0",
+    "@mui/icons-material": "^5.8.4",
+    "ahooks": "^2.10.14",
     "axios": "^0.27.2",
     "flat": "^5.0.2",
     "lodash": "^4.17.21",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.8.1",
     "react-error-boundary": "^3.1.4",
     "react-infinite-scroll-hook": "^4.0.3",
     "styled-components": "5.3.5",
@@ -54,15 +54,15 @@
   },
   "devDependencies": {
     "@arcblock/eslint-config": "0.2.2",
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.8.4",
-    "@babel/preset-env": "^7.8.4",
-    "@babel/preset-react": "^7.8.3",
-    "@emotion/babel-plugin": "^11.9.2",
+    "@babel/cli": "^7.18.10",
+    "@babel/core": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
+    "@babel/preset-react": "^7.18.6",
+    "@emotion/babel-plugin": "^11.10.0",
     "babel-plugin-inline-react-svg": "^2.0.1",
-    "babel-plugin-styled-components": "^1.10.7",
-    "eslint": "^8.16.0",
-    "prettier": "^2.6.2"
+    "babel-plugin-styled-components": "^1.13.3",
+    "eslint": "^8.21.0",
+    "prettier": "^2.7.1"
   },
-  "gitHead": "3ddb0217a07753400bdcfefd10c76f76e69a3b05"
+  "gitHead": "22d308f630ec17c18162f750edaf6d71012efaac"
 }

package/src/base.js CHANGED Viewed

@@ -37,46 +37,48 @@ function ListBase() {
         <Aside />
       </Hidden>
       <StyledMin>
-        <Box className="filter-bar" display="flex" alignItems="center">
-          <StyledSearch className="search-container" placeholder={t('common.searchStore')} />
-          <Box mt={0} ml="16px" className="filter-container">
-            <Hidden mdUp>
-              {/* 小屏幕下类别 */}
-              <FilterIcon />
-            </Hidden>
-            {/* 排序选择器 */}
-            <CustomSelect
-              value={filters.sortBy}
-              options={sortOptions}
-              title={sortLocale}
-              icon={<SortIcon />}
-              onChange={(v) => {
-                handleSort(v);
+        <FilterContainer>
+          <Box className="filter-bar" display="flex" alignItems="center">
+            <StyledSearch className="search-container" placeholder={t('common.searchStore')} />
+            <Box mt={0} ml="16px" className="filter-container">
+              <Hidden mdUp>
+                {/* 小屏幕下类别 */}
+                <FilterIcon />
+              </Hidden>
+              {/* 排序选择器 */}
+              <CustomSelect
+                value={filters.sortBy}
+                options={sortOptions}
+                title={sortLocale}
+                icon={<SortIcon />}
+                onChange={(v) => {
+                  handleSort(v);
+                }}
+              />
+            </Box>
+          </Box>
+          <Box display="flex" flexWrap="wrap" alignItems="center" mb="16px">
+            <CustomChip
+              label={developerName}
+              icon={<FaceIcon />}
+              onDelete={() => {
+                handleDeveloper(null);
+              }}
+            />
+            <CustomChip
+              label={categoryLocale}
+              onDelete={() => {
+                handleCategory(null);
+              }}
+            />
+            <CustomChip
+              label={priceLocale}
+              onDelete={() => {
+                handlePrice(null);
               }}
             />
           </Box>
-        </Box>
-        <Box display="flex" flexWrap="wrap" alignItems="center" mb="16px">
-          <CustomChip
-            label={developerName}
-            icon={<FaceIcon />}
-            onDelete={() => {
-              handleDeveloper(null);
-            }}
-          />
-          <CustomChip
-            label={categoryLocale}
-            onDelete={() => {
-              handleCategory(null);
-            }}
-          />
-          <CustomChip
-            label={priceLocale}
-            onDelete={() => {
-              handlePrice(null);
-            }}
-          />
-        </Box>
+        </FilterContainer>
         <ErrorBoundary FallbackComponent={ErrorFallback}>
           <div style={{ position: 'relative', flex: 1, overflow: 'auto' }}>
             <BlockletList blocklets={blockletList} />
@@ -137,4 +139,11 @@ const StyledSearch = styled(Search)`
   background-color: ${(props) => props.theme.palette.grey[50]};
 `;
+const FilterContainer = styled.div`
+  position: sticky;
+  top: 0;
+  z-index: 999;
+  background-color: white;
+`;
 export default ListBase;

package/src/components/aside.js CHANGED Viewed

@@ -30,7 +30,10 @@ const StyledAside = styled.aside`
   width: 220px;
   margin-right: ${(props) => props.theme.spacing(2)};
   height: 100%;
+  position: sticky;
+  top: 0;
   overflow-y: auto;
+  z-index: 999;
 `;
 Aside.propTypes = {};

package/src/components/filter/custom-chip.js CHANGED Viewed

@@ -15,7 +15,7 @@ function FilterChip({ label, icon, onDelete, ...containerProps }) {
   if (!label) return null;
   return (
     <StyleDiv {...containerProps}>
-      <Chip data-cy="filter-tag" icon={icon} label={label} onDelete={onDelete} />
+      <Chip color="primary" data-cy="filter-tag" icon={icon} label={label} onDelete={onDelete} />
     </StyleDiv>
   );
 }