Commit 1e58a97

authored

Merge pull request #674 from NotionX/wustep/improvements

2 parents 6468b7a + d4d4774 commit 1e58a97Copy full SHA for 1e58a97

File tree

+17

-6

lines changed

contributing.md
examples
- full/pages
  - [pageId].tsx
- minimal/pages
  - [pageId].tsx
packages
- notion-utils/src
  - map-image-url.ts
- react-notion-x/src/components
  - asset.tsx

+17

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@ Suggestions and pull requests are highly encouraged. Have a look at the [open is`
`6`	`6`
`7`	`7`	To develop the project locally, you'll need a recent version of Node.js and `pnpm` installed globally.
`8`	`8`
`9`		-To get started, clone the repo and run `pnpm` from the root directory:
	`9`	+To get started, clone the repo and run `pnpm install` from the root directory:
`10`	`10`
`11`	`11`	```bash
`12`	`12`	`git clone https://github.com/NotionX/react-notion-x.git`
`13`	`13`	`cd react-notion-x`
`14`		`-pnpm`
	`14`	`+pnpm install`
`15`	`15`	```
`16`	`16`
`17`	`17`	This will install dependencies and link all of the local packages together using `lerna`. This includes the example projects which will now point to the local version of your packages.

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ export const getStaticProps = async (context: any) => {`
`16`	`16`	`const recordMap = await notion.getPage(pageId)`
`17`	`17`
`18`	`18`	`// NOTE: this isn't necessary; trying to reduce my vercel bill`
`19`		`- if (recordMap.block[0]?.value?.space_id !== rootNotionSpaceId) {`
	`19`	`+ const blockIds = Object.keys(recordMap.block)`
	`20`	`+ const firstBlock = blockIds.length > 0 ? recordMap.block[blockIds[0]!] : null`
	`21`	`+ if (rootNotionSpaceId && firstBlock?.value?.space_id !== rootNotionSpaceId) {`
`20`	`22`	`return {`
`21`	`23`	`notFound: true`
`22`	`24`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ export const getStaticProps = async (context: any) => {`
`9`	`9`	`const recordMap = await notion.getPage(pageId)`
`10`	`10`
`11`	`11`	`// NOTE: this isn't necessary; trying to reduce my vercel bill`
`12`		`- if (recordMap.block[0]?.value?.space_id !== rootNotionSpaceId) {`
	`12`	`+ const blockIds = Object.keys(recordMap.block)`
	`13`	`+ const firstBlock = blockIds.length > 0 ? recordMap.block[blockIds[0]!] : null`
	`14`	`+ if (rootNotionSpaceId && firstBlock?.value?.space_id !== rootNotionSpaceId) {`
`13`	`15`	`return {`
`14`	`16`	`notFound: true`
`15`	`17`	`}`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`import { type Block } from 'notion-types'`
`2`	`2`
	`3`	`+// eslint-disable-next-line security/detect-unsafe-regex`
	`4`	`+const GIF_REGEXP = /(?:https?:\/\/)?[^\s]+\.gif(?=$\|\?\|#)/`
	`5`	`+`
`3`	`6`	`export const defaultMapImageUrl = (`
`4`	`7`	`url: string \| undefined,`
`5`	`8`	`block: Block`
`@@ -12,6 +15,10 @@ export const defaultMapImageUrl = (`
`12`	`15`	`return url`
`13`	`16`	`}`
`14`	`17`
	`18`	`+ if (GIF_REGEXP.test(url)) {`
	`19`	`+ return url`
	`20`	`+ }`
	`21`	`+`
`15`	`22`	`// more recent versions of notion don't proxy unsplash images`
`16`	`23`	`if (url.startsWith('https://images.unsplash.com')) {`
`17`	`24`	`return url`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -274,9 +274,9 @@ export function Asset({`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`	`} else if (block.type === 'image') {`
`277`		`- // console.log('image', block)`
`278`	`277`	`// TODO: kind of a hack for now. New file.notion.so images aren't signed correctly`
`279`		`- if (source.includes('file.notion.so')) {`
	`278`	`+ // Gifs need to use their original file URLs and not the source prop (see #663)`
	`279`	`+ if (!source.includes('.gif') && source.includes('file.notion.so')) {`
`280`	`280`	`source = block.properties?.source?.[0]?.[0]`
`281`	`281`	`}`
`282`	`282`	`const src = mapImageUrl(source, block as Block)`

Comments

(0)