@blocklet/list 0.9.19 → 0.9.20

package/lib/components/autocomplete/index.js

@@ -49,8 +49,7 @@ function Autocomplete(_ref) {
     filters,
     endpoint,
     handleKeyword,
-    t,
-    serverUrl
+    t
   } = (0, _filter.useFilterContext)();
   const muiTheme = (0, _styles.useTheme)();
   const getResults = (0, _react.useCallback)(async params => {
@@ -61,15 +60,6 @@ function Autocomplete(_ref) {
     });
     return data.dataList || [];
   }, [storeApi]);
-  const getBlockletDetail = (0, _react.useCallback)(item => {
-    let blockletDetail = (0, _urlJoin.default)(endpoint, "/blocklets/".concat(item.did));
-
-    if (serverUrl) {
-      blockletDetail = "".concat(blockletDetail, "?server-url=").concat(encodeURIComponent(serverUrl));
-    }
-
-    return blockletDetail;
-  }, [endpoint, serverUrl]);
   const onSubmit = (0, _react.useCallback)(e => {
     handleKeyword(e.state.query);
   }, [handleKeyword]);
@@ -152,7 +142,7 @@ function Autocomplete(_ref) {
             } = _ref5;
             onSelect({
               blocklet: item,
-              detailUrl: getBlockletDetail(item),
+              detailUrl: (0, _urlJoin.default)(endpoint, "/blocklets/".concat(item.did)),
               storeUrl: endpoint
             });
           },
@@ -191,7 +181,7 @@ function Autocomplete(_ref) {
     return () => {
       search.destroy();
     };
-  }, [endpoint, filters, getBlockletDetail, getResults, muiTheme, onReset, onSubmit, onSelect, t]);
+  }, [endpoint, filters, getResults, muiTheme, onReset, onSubmit, onSelect, t]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "bl-search-container",
     ref: containerRef

package/lib/contexts/filter.js

@@ -51,8 +51,7 @@ function FilterProvider(_ref) {
     blockletRender,
     onFilterChange,
     onSearchSelect,
-    extraFilter,
-    serverUrl
+    extraFilter
   } = _ref;
 
   const storeApi = _axios.default.create({
@@ -163,7 +162,6 @@ function FilterProvider(_ref) {
     categoryOptions,
     priceOptions,
     storeApi,
-    serverUrl,
     hasNextPage: blockletsState.list.length < blockletsState.total,
     handleSort: sort => {
       const changeData = _objectSpread(_objectSpread({}, finalFilters), {}, {

package/lib/libs/prop-types.js

@@ -23,8 +23,7 @@ const propTypes = {
   blockletRender: _propTypes.default.func.isRequired,
   onFilterChange: _propTypes.default.func,
   onSearchSelect: _propTypes.default.func,
-  locale: _propTypes.default.oneOf(['zh', 'en']),
-  serverUrl: _propTypes.default.string
+  locale: _propTypes.default.oneOf(['zh', 'en'])
 };
 exports.propTypes = propTypes;
 const defaultProps = {
@@ -37,7 +36,6 @@ const defaultProps = {
     } = _ref;
     window.location.href = detailUrl;
   },
-  extraFilter: list => list,
-  serverUrl: null
+  extraFilter: list => list
 };
 exports.defaultProps = defaultProps;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/list",
-  "version": "0.9.19",
+  "version": "0.9.20",
   "description": "Common ux components of blocklet",
   "publishConfig": {
     "access": "public"
@@ -68,5 +68,5 @@
     "eslint": "^8.22.0",
     "prettier": "^2.7.1"
   },
-  "gitHead": "c166d6de848c0c1eecf38a65360ca75a56a8a020"
+  "gitHead": "7e8a387a49a0f0164bcd39ff938372bd1d5d113d"
 }

package/src/components/autocomplete/index.js

@@ -16,7 +16,7 @@ export default function Autocomplete({ onSelect }) {
   const containerRef = useRef(null);
   const panelRootRef = useRef(null);
   const rootRef = useRef(null);
-  const { storeApi, filters, endpoint, handleKeyword, t, serverUrl } = useFilterContext();
+  const { storeApi, filters, endpoint, handleKeyword, t } = useFilterContext();
   const muiTheme = useTheme();
 
   const getResults = useCallback(
@@ -28,17 +28,6 @@ export default function Autocomplete({ onSelect }) {
     [storeApi]
   );
 
-  const getBlockletDetail = useCallback(
-    (item) => {
-      let blockletDetail = joinUrl(endpoint, `/blocklets/${item.did}`);
-      if (serverUrl) {
-        blockletDetail = `${blockletDetail}?server-url=${encodeURIComponent(serverUrl)}`;
-      }
-      return blockletDetail;
-    },
-    [endpoint, serverUrl]
-  );
-
   const onSubmit = useCallback(
     (e) => {
       handleKeyword(e.state.query);
@@ -99,7 +88,7 @@ export default function Autocomplete({ onSelect }) {
               return item.title;
             },
             onSelect({ item }) {
-              onSelect({ blocklet: item, detailUrl: getBlockletDetail(item), storeUrl: endpoint });
+              onSelect({ blocklet: item, detailUrl: joinUrl(endpoint, `/blocklets/${item.did}`), storeUrl: endpoint });
             },
             templates: {
               // eslint-disable-next-line react/no-unstable-nested-components
@@ -131,7 +120,7 @@ export default function Autocomplete({ onSelect }) {
     return () => {
       search.destroy();
     };
-  }, [endpoint, filters, getBlockletDetail, getResults, muiTheme, onReset, onSubmit, onSelect, t]);
+  }, [endpoint, filters, getResults, muiTheme, onReset, onSubmit, onSelect, t]);
 
   return <div className="bl-search-container" ref={containerRef} />;
 }

package/src/contexts/filter.js

@@ -20,7 +20,6 @@ function FilterProvider({
   onFilterChange,
   onSearchSelect,
   extraFilter,
-  serverUrl,
 }) {
   const storeApi = axios.create({
     baseURL: endpoint,
@@ -115,7 +114,6 @@ function FilterProvider({
     categoryOptions,
     priceOptions,
     storeApi,
-    serverUrl,
     hasNextPage: blockletsState.list.length < blockletsState.total,
     handleSort: (sort) => {
       const changeData = {

package/src/libs/prop-types.js

@@ -15,7 +15,6 @@ const propTypes = {
   onFilterChange: PropTypes.func,
   onSearchSelect: PropTypes.func,
   locale: PropTypes.oneOf(['zh', 'en']),
-  serverUrl: PropTypes.string,
 };
 
 const defaultProps = {
@@ -26,7 +25,6 @@ const defaultProps = {
     window.location.href = detailUrl;
   },
   extraFilter: (list) => list,
-  serverUrl: null,
 };
 
 export { propTypes, defaultProps };