Jelajahi Sumber

Merge branch 'feat/77525-enable-to-delete-pages' into feat/77525-80785-implement-select-all

# Conflicts:
#	packages/app/src/components/SearchPage/SearchResultListItem.tsx
SULLEY\ryo-h 4 tahun lalu
induk
melakukan
6b1d35d717

+ 1 - 1
packages/app/src/components/SearchPage/SearchResultList.tsx

@@ -29,7 +29,7 @@ const SearchResultList: FC<Props> = (props:Props) => {
   const focusedPageId = focusedPage != null && focusedPage._id != null ? focusedPage._id : '';
   return (
     <>
-      {props.pages.map((page) => {
+      {Array.isArray(props.pages) && props.pages.map((page) => {
         return (
           <SearchResultListItem
             key={page._id}

+ 1 - 1
packages/app/src/components/SearchPage/SearchResultListItem.tsx

@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React, { FC } from 'react';
 
 import Clamp from 'react-multiline-clamp';