@blocklet/list 0.8.35 → 0.8.38

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

@@ -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, {
+      "data-cy": "filter-tag",
       icon: icon,
       label: label,
       onDelete: onDelete

package/lib/contexts/filter.js

@@ -109,10 +109,11 @@ function FilterProvider(_ref) {
   const selectedCategory = finalFilters.category;
   const hasDeveloperFilter = !!finalFilters.developer;
   const categoryState = (0, _react.useMemo)(() => {
+    // 当按作者过滤时，需要从所有blocklets中找出属于作者的分类
     return !hasDeveloperFilter ? {
       data: allCategories
-    } : (0, _utils.getCategories)(allBlocklets, finalFilters.developer);
-  }, [hasDeveloperFilter, allCategories]);
+    } : (0, _utils.getCategoriesByAuthor)(allBlocklets, finalFilters.developer);
+  }, [hasDeveloperFilter, allCategories, allBlocklets]);
   const blockletList = (0, _react.useMemo)(() => {
     var _finalFilters$keyword;
 

package/lib/libs/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.urlStringify = exports.replaceTranslate = exports.removeUndefined = exports.isMobileScreen = exports.getStoreDetail = exports.getSortOptions = exports.getPrices = exports.getCategoryOptions = exports.getCategories = exports.formatLogoPath = exports.formatError = exports.filterBlockletByPrice = void 0;
+exports.urlStringify = exports.replaceTranslate = exports.removeUndefined = exports.isMobileScreen = exports.getStoreDetail = exports.getSortOptions = exports.getPrices = exports.getCategoryOptions = exports.getCategoriesByAuthor = exports.formatLogoPath = exports.formatError = exports.filterBlockletByPrice = void 0;
 
 var _urlJoin = _interopRequireDefault(require("url-join"));
 
@@ -59,7 +59,7 @@ const getCategoryOptions = function getCategoryOptions() {
   }));
 };
 /**
- * 从开发者所属 blocklets 中的得到 Categories
+ * 从 blocklets 中的得到属于作者的 Categories
  * @param {*} list
  * @param {*} developerDid
  * @returns
@@ -68,7 +68,7 @@ const getCategoryOptions = function getCategoryOptions() {
 
 exports.getCategoryOptions = getCategoryOptions;
 
-const getCategories = function getCategories() {
+const getCategoriesByAuthor = function getCategoriesByAuthor() {
   let list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   let developerDid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   const filterList = list.filter(item => developerDid ? item.owner.did === developerDid : true);
@@ -87,7 +87,7 @@ const getCategories = function getCategories() {
  */
 
 
-exports.getCategories = getCategories;
+exports.getCategoriesByAuthor = getCategoriesByAuthor;
 
 const filterBlockletByPrice = function filterBlockletByPrice() {
   let list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/list",
-  "version": "0.8.35",
+  "version": "0.8.38",
   "description": "Common ux components of blocklet",
   "publishConfig": {
     "access": "public"
@@ -38,7 +38,7 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/ux": "^2.1.21",
+    "@arcblock/ux": "^2.1.30",
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
     "@mui/icons-material": "^5.6.2",
@@ -64,5 +64,5 @@
     "eslint": "^8.16.0",
     "prettier": "^2.6.2"
   },
-  "gitHead": "f6a52e3c84e6eb4cd5625f688a55d7da1b477740"
+  "gitHead": "f08730b178cc3694c813b585941d1e9846120103"
 }

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

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

package/src/contexts/filter.js

@@ -5,7 +5,7 @@ import orderBy from 'lodash/orderBy';
 import axios from 'axios';
 import isArray from 'lodash/isArray';
 import {
-  getCategories,
+  getCategoriesByAuthor,
   filterBlockletByPrice,
   replaceTranslate,
   getPrices,
@@ -59,8 +59,9 @@ function FilterProvider({ filters, children, endpoint, locale, blockletRender, o
   const selectedCategory = finalFilters.category;
   const hasDeveloperFilter = !!finalFilters.developer;
   const categoryState = useMemo(() => {
-    return !hasDeveloperFilter ? { data: allCategories } : getCategories(allBlocklets, finalFilters.developer);
-  }, [hasDeveloperFilter, allCategories]);
+    // 当按作者过滤时，需要从所有blocklets中找出属于作者的分类
+    return !hasDeveloperFilter ? { data: allCategories } : getCategoriesByAuthor(allBlocklets, finalFilters.developer);
+  }, [hasDeveloperFilter, allCategories, allBlocklets]);
 
   const blockletList = useMemo(() => {
     const sortByName = (x) => x?.title?.toLocaleLowerCase() || x?.name?.toLocaleLowerCase(); // 按名称排序

package/src/libs/utils.js

@@ -39,12 +39,12 @@ const getCategoryOptions = (list = [], locale = 'en') => {
   return list.map((item) => ({ name: item.locales[locale], value: item.name }));
 };
 /**
- * 从开发者所属 blocklets 中的得到 Categories
+ * 从 blocklets 中的得到属于作者的 Categories
  * @param {*} list
  * @param {*} developerDid
  * @returns
  */
-const getCategories = (list = [], developerDid = null) => {
+const getCategoriesByAuthor = (list = [], developerDid = null) => {
   const filterList = list.filter((item) => (developerDid ? item.owner.did === developerDid : true));
   const Categories = filterList.map((item) => item.category);
   const res = new Map();
@@ -113,7 +113,7 @@ const isMobileScreen = () => {
 export {
   getSortOptions,
   getPrices,
-  getCategories,
+  getCategoriesByAuthor,
   filterBlockletByPrice,
   getStoreDetail,
   formatLogoPath,