Merge branch 'master' into master

transitive-bullshit · web-flow · commit 9dfc26851ee9 · 2025-09-19T15:18:20.000+08:00
diff --git a/.npmrc b/.npmrc
diff --git a/examples/cra/package.json b/examples/cra/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-x-example-cra",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "private": true,
   "scripts": {
     "dev": "DISABLE_ESLINT_PLUGIN=true GENERATE_SOURCEMAP=false react-scripts start",
diff --git a/examples/full/package.json b/examples/full/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-x-example-full",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/examples/full/pages/[pageId].tsx b/examples/full/pages/[pageId].tsx
@@ -19,11 +19,11 @@ export const getStaticProps = async (context: any) => {
     props: {
       recordMap
     },
-    // cache for 60 minutes
+    // cache for 1 week in seconds
     // NOTE: you'll likely want to use a shorter cache time for your app, but
     // I'm bumping this up because my vercel bill keeps increasing due to people
     // abusing the demo to host their own sites.
-    revalidate: 60 * 60
+    revalidate: 604_800
   }
 }
 
diff --git a/examples/full/pages/index.tsx b/examples/full/pages/index.tsx
@@ -16,7 +16,7 @@ export const getStaticProps = async () => {
     props: {
       recordMap
     },
-    revalidate: 10
+    revalidate: 86_400 // cache for 1 day in seconds
   }
 }
 
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-x-example-minimal",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/examples/minimal/pages/[pageId].tsx b/examples/minimal/pages/[pageId].tsx
@@ -12,7 +12,11 @@ export const getStaticProps = async (context: any) => {
     props: {
       recordMap
     },
-    revalidate: 60 * 60 // cache for 60 minutes
+    // cache for 1 week in seconds
+    // NOTE: you'll likely want to use a shorter cache time for your app, but
+    // I'm bumping this up because my vercel bill keeps increasing due to people
+    // abusing the demo to host their own sites.
+    revalidate: 604_800
   }
 }
 
diff --git a/examples/minimal/pages/index.tsx b/examples/minimal/pages/index.tsx
@@ -12,7 +12,11 @@ export const getStaticProps = async () => {
     props: {
       recordMap
     },
-    revalidate: 10
+    // cache for 1 day in seconds
+    // NOTE: you'll likely want to use a shorter cache time for your app, but
+    // I'm bumping this up because my vercel bill keeps increasing due to people
+    // abusing the demo to host their own sites.
+    revalidate: 86_400
   }
 }
 
diff --git a/package.json b/package.json
@@ -5,8 +5,8 @@
   "repository": "NotionX/react-notion-x",
   "author": "Travis Fischer <travis@transitivebullsh.it>",
   "license": "MIT",
-  "version": "7.4.3",
-  "packageManager": "pnpm@10.11.1",
+  "version": "7.5.1",
+  "packageManager": "pnpm@10.17.0",
   "engines": {
     "node": ">=18"
   },
@@ -22,7 +22,6 @@
     "test:unit": "turbo test:unit",
     "release": "bumpp -r && pnpm publish -r",
     "pretest": "run-s build",
-    "preinstall": "npx only-allow pnpm",
     "prepare": "simple-git-hooks"
   },
   "devDependencies": {
diff --git a/packages/notion-client/package.json b/packages/notion-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-client",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "type": "module",
   "description": "Robust TypeScript client for the unofficial Notion API.",
   "repository": "NotionX/react-notion-x",
diff --git a/packages/notion-client/src/notion-api.ts b/packages/notion-client/src/notion-api.ts
@@ -431,7 +431,7 @@ export class NotionAPI {
   public async getCollectionData(
     collectionId: string,
     collectionViewId: string,
-    collectionView: any,
+    collectionView?: any,
     {
       limit = 999,
       searchQuery = '',
@@ -652,7 +652,7 @@ export class NotionAPI {
 
   public async getBlocks(blockIds: string[], ofetchOptions?: OfetchOptions) {
     return this.fetch<notion.PageChunk>({
-      endpoint: 'syncRecordValues',
+      endpoint: 'syncRecordValuesMain',
       body: {
         requests: blockIds.map((blockId) => ({
           // TODO: when to use table 'space' vs 'block'?
diff --git a/packages/notion-compat/package.json b/packages/notion-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-compat",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "type": "module",
   "description": "Compatibility layer between the official Notion API and unofficial private API.",
   "repository": "NotionX/react-notion-x",
diff --git a/packages/notion-compat/src/convert-block.ts b/packages/notion-compat/src/convert-block.ts
@@ -460,8 +460,18 @@ export function convertBlock({
     }
 
     case 'image':
-      // no-op
-      // TODO: handle formatting
+      // TODO : Add image format
+      if (block.image) {
+        compatBlock.properties.source = [
+          [(block.image as any).file?.url || (block.image as any).external?.url]
+        ]
+
+        if (block.image.caption) {
+          compatBlock.properties.caption = block.image.caption.map((caption) =>
+            convertRichText([caption])
+          )
+        }
+      }
       break
 
     case 'audio':
diff --git a/packages/notion-types/package.json b/packages/notion-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-types",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "type": "module",
   "description": "TypeScript types for core Notion data structures.",
   "repository": "NotionX/react-notion-x",
diff --git a/packages/notion-types/src/block.ts b/packages/notion-types/src/block.ts
@@ -131,6 +131,7 @@ export interface BaseContentBlock extends BaseBlock {
   properties: {
     source: string[][]
     caption?: Decoration[]
+    alt_text?: Decoration[]
   }
   format?: {
     block_alignment: 'center' | 'left' | 'right'
diff --git a/packages/notion-utils/package.json b/packages/notion-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-utils",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "type": "module",
   "description": "Useful utilities for working with Notion data. Isomorphic.",
   "repository": "NotionX/react-notion-x",
diff --git a/packages/notion-utils/src/get-all-pages-in-space.ts b/packages/notion-utils/src/get-all-pages-in-space.ts
@@ -108,9 +108,15 @@ export async function getAllPagesInSpace(
               page.collection_query
             )) {
               for (const collectionData of Object.values(collectionViews)) {
-                const { blockIds } = collectionData
-
-                if (blockIds) {
+                const blockIds = Array.from(
+                  new Set([
+                    ...(collectionData?.collection_group_results?.blockIds ||
+                      []),
+                    ...(collectionData.blockIds || [])
+                  ])
+                )
+
+                if (blockIds.length) {
                   for (const collectionItemId of blockIds) {
                     void processPage(collectionItemId, depth + 1)
                   }
diff --git a/packages/react-notion-x/package.json b/packages/react-notion-x/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-notion-x",
-  "version": "7.4.3",
+  "version": "7.5.1",
   "type": "module",
   "description": "Fast and accurate React renderer for Notion.",
   "repository": "NotionX/react-notion-x",
diff --git a/packages/react-notion-x/src/components/asset.tsx b/packages/react-notion-x/src/components/asset.tsx
@@ -280,8 +280,9 @@ export function Asset({
       source = block.properties?.source?.[0]?.[0]
     }
     const src = mapImageUrl(source, block as Block)
+    const altText = getTextContent(block.properties?.alt_text)
     const caption = getTextContent(block.properties?.caption)
-    const alt = caption || 'notion image'
+    const alt = altText || caption || 'notion image'
 
     content = (
       <LazyImage
diff --git a/packages/react-notion-x/src/styles.css b/packages/react-notion-x/src/styles.css
@@ -493,6 +493,7 @@
   max-width: 100%;
   white-space: pre-wrap;
   word-break: break-word;
+  width:100%;
 }
 
 .notion-h1 {
diff --git a/packages/react-notion-x/src/third-party/collection-utils.ts b/packages/react-notion-x/src/third-party/collection-utils.ts
@@ -34,7 +34,7 @@ export function getCollectionGroups(
       }
 
       // TODO: review dates format based on value.type ('week'|'month'|'year')
-      queryValue = format(new Date(queryLabel), 'MMM d, YYY hh:mm aa')
+      queryValue = format(new Date(queryLabel), 'MMM d, yyyy hh:mm aa')
     }
 
     return {
diff --git a/packages/react-notion-x/src/third-party/eval-formula.ts b/packages/react-notion-x/src/third-party/eval-formula.ts
@@ -300,7 +300,7 @@ function evalFunctionFormula(
 
         case 'object':
           if (value instanceof Date) {
-            return format(value as Date, 'MMM d, YYY')
+            return format(value as Date, 'MMM d, yyyy')
           } else {
             // shouldn't ever get here
             return `${value}`
@@ -361,26 +361,28 @@ function evalFunctionFormula(
     case 'dateAdd': {
       const date = evalFormula(args[0]!, ctx) as Date
       const number = evalFormula(args[1]!, ctx) as number
-      const unit = evalFormula(args[1]!, ctx) as string
+      const unit = evalFormula(args[2]!, ctx) as string
       return add(date, { [unit]: number })
     }
 
     case 'dateBetween': {
       const date1 = evalFormula(args[0]!, ctx) as Date
       const date2 = evalFormula(args[1]!, ctx) as Date
-      const unit = evalFormula(args[1]!, ctx) as string
+      const unit = evalFormula(args[2]!, ctx) as string
       return (
-        intervalToDuration({
-          start: date2,
-          end: date1
-        }) as any
-      )[unit] as number
+        (
+          intervalToDuration({
+            start: date2,
+            end: date1
+          }) as any
+        )[unit] ?? 0
+      )
     }
 
     case 'dateSubtract': {
       const date = evalFormula(args[0]!, ctx) as Date
       const number = evalFormula(args[1]!, ctx) as number
-      const unit = evalFormula(args[1]!, ctx) as string
+      const unit = evalFormula(args[2]!, ctx) as string
       return sub(date, { [unit]: number })
     }
 
diff --git a/packages/react-notion-x/src/third-party/property.tsx b/packages/react-notion-x/src/third-party/property.tsx
@@ -92,7 +92,7 @@ export function PropertyImpl(props: IPropertyProps) {
           }
 
           if (content instanceof Date) {
-            content = format(content, 'MMM d, YYY hh:mm aa')
+            content = format(content, 'MMM d, yyyy hh:mm aa')
           }
         } catch {
           // console.log('error evaluating formula', schema.formula, err)
@@ -437,15 +437,15 @@ export function PropertyImpl(props: IPropertyProps) {
   const renderCreatedTimeValue = React.useMemo(
     () =>
       function CreatedTimeProperty() {
-        return format(new Date(block!.created_time), 'MMM d, YYY hh:mm aa')
+        return format(new Date(block!.created_time), 'MMM d, yyyy hh:mm aa')
       },
     [block]
   )
 
   const renderLastEditedTimeValue = React.useMemo(
     () =>
       function LastEditedTimeProperty() {
-        return format(new Date(block!.last_edited_time), 'MMM d, YYY hh:mm aa')
+        return format(new Date(block!.last_edited_time), 'MMM d, yyyy hh:mm aa')
       },
     [block]
   )
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "notion-x-example-cra",`
`3`		`- "version": "7.4.3",`
	`3`	`+ "version": "7.5.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "DISABLE_ESLINT_PLUGIN=true GENERATE_SOURCEMAP=false react-scripts start",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "notion-x-example-full",`
`3`		`- "version": "7.4.3",`
	`3`	`+ "version": "7.5.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ export const getStaticProps = async (context: any) => {`
`19`	`19`	`props: {`
`20`	`20`	`recordMap`
`21`	`21`	`},`
`22`		`- // cache for 60 minutes`
	`22`	`+ // cache for 1 week in seconds`
`23`	`23`	`// NOTE: you'll likely want to use a shorter cache time for your app, but`
`24`	`24`	`// I'm bumping this up because my vercel bill keeps increasing due to people`
`25`	`25`	`// abusing the demo to host their own sites.`
`26`		`- revalidate: 60 * 60`
	`26`	`+ revalidate: 604_800`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export const getStaticProps = async () => {`
`16`	`16`	`props: {`
`17`	`17`	`recordMap`
`18`	`18`	`},`
`19`		`- revalidate: 10`
	`19`	`+ revalidate: 86_400 // cache for 1 day in seconds`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "notion-x-example-minimal",`
`3`		`- "version": "7.4.3",`
	`3`	`+ "version": "7.5.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,11 @@ export const getStaticProps = async (context: any) => {`
`12`	`12`	`props: {`
`13`	`13`	`recordMap`
`14`	`14`	`},`
`15`		`- revalidate: 60 * 60 // cache for 60 minutes`
	`15`	`+ // cache for 1 week in seconds`
	`16`	`+ // NOTE: you'll likely want to use a shorter cache time for your app, but`
	`17`	`+ // I'm bumping this up because my vercel bill keeps increasing due to people`
	`18`	`+ // abusing the demo to host their own sites.`
	`19`	`+ revalidate: 604_800`
`16`	`20`	`}`
`17`	`21`	`}`
`18`	`22`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "notion-client",`
`3`		`- "version": "7.4.3",`
	`3`	`+ "version": "7.5.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "Robust TypeScript client for the unofficial Notion API.",`
`6`	`6`	`"repository": "NotionX/react-notion-x",`