feat: fix indirect getBlockCollectionId

Author: transitive-bullshit

packages/notion-client/src/notion-api.ts

@@ -118,28 +118,13 @@ export class NotionAPI {
           block &&
           (block.type === 'collection_view' ||
             block.type === 'collection_view_page') &&
-          getBlockCollectionId(block)
+          getBlockCollectionId(block, recordMap)
 
         if (collectionId) {
           return block.view_ids?.map((collectionViewId) => ({
             collectionId,
             collectionViewId
           }))
-        } else if (block && (block as any).view_ids) {
-          return (block as any).view_ids.map((collectionViewId) => {
-            if (recordMap.collection_view[collectionViewId]) {
-              const viewBlock =
-                recordMap.collection_view[collectionViewId].value
-              const collectionId = viewBlock.format?.collection_pointer?.id
-              if (collectionId) {
-                return {
-                  collectionId,
-                  collectionViewId
-                }
-              }
-            }
-            return null
-          })
         } else {
           return []
         }

packages/notion-utils/src/get-block-collection-id.ts

@@ -1,9 +1,25 @@
-import { Block } from 'notion-types'
+import { Block, ExtendedRecordMap } from 'notion-types'
 
-export function getBlockCollectionId(block: Block): string | null {
-  return (
+export function getBlockCollectionId(
+  block: Block,
+  recordMap: ExtendedRecordMap
+): string | null {
+  const collectionId =
     (block as any).collection_id ||
-    (block as any).format?.collection_pointer?.id ||
-    null
-  )
+    (block as any).format?.collection_pointer?.id
+
+  if (collectionId) {
+    return collectionId
+  }
+
+  const collectionViewId = (block as any)?.view_ids?.[0]
+  if (collectionViewId) {
+    const collectionView = recordMap.collection_view?.[collectionViewId]?.value
+    if (collectionView) {
+      const collectionId = collectionView.format?.collection_pointer?.id
+      return collectionId
+    }
+  }
+
+  return null
 }

packages/notion-utils/src/get-block-collection-pointer-id.ts

@@ -10,7 +10,7 @@ export function getBlockIcon(block: Block, recordMap: ExtendedRecordMap) {
     block.type === 'collection_view_page' ||
     block.type === 'collection_view'
   ) {
-    const collectionId = getBlockCollectionId(block)
+    const collectionId = getBlockCollectionId(block, recordMap)
     if (collectionId) {
       const collection = recordMap.collection[collectionId]?.value
 

packages/notion-utils/src/get-block-icon.ts

@@ -11,10 +11,14 @@ export function getBlockTitle(block: Block, recordMap: ExtendedRecordMap) {
     block.type === 'collection_view_page' ||
     block.type === 'collection_view'
   ) {
-    const collection = recordMap.collection[getBlockCollectionId(block)]?.value
+    const collectionId = getBlockCollectionId(block, recordMap)
 
-    if (collection) {
-      return getTextContent(collection.name)
+    if (collectionId) {
+      const collection = recordMap.collection[collectionId]?.value
+
+      if (collection) {
+        return getTextContent(collection.name)
+      }
     }
   }
 

packages/notion-utils/src/get-block-title.ts

@@ -21,4 +21,3 @@ export * from './normalize-title'
 export * from './merge-record-maps'
 export * from './format-date'
 export * from './format-notion-date-time'
-export * from './get-block-collection-pointer-id'

packages/notion-utils/src/index.ts

@@ -120,8 +120,8 @@ export const Block: React.FC<BlockProps> = (props) => {
               ? block.properties
               : {
                   title:
-                    recordMap.collection[getBlockCollectionId(block)]?.value
-                      ?.name
+                    recordMap.collection[getBlockCollectionId(block, recordMap)]
+                      ?.value?.name
                 }
 
           const coverPosition = (1 - (page_cover_position || 0.5)) * 100

packages/react-notion-x/src/block.tsx

@@ -2,7 +2,6 @@ import * as React from 'react'
 import * as types from 'notion-types'
 import {
   getBlockCollectionId,
-  getBlockCollectionPointerId,
   getBlockParentPage,
   getTextContent
 } from 'notion-utils'
@@ -84,8 +83,7 @@ const CollectionViewBlock: React.FC<{
 }> = ({ block, className }) => {
   const { recordMap, showCollectionViewDropdown } = useNotionContext()
   const { view_ids: viewIds } = block
-  const collectionId =
-    getBlockCollectionId(block) ?? getBlockCollectionPointerId(recordMap, block)
+  const collectionId = getBlockCollectionId(block, recordMap)
 
   const [isMounted, setIsMounted] = React.useState(false)
   React.useEffect(() => {