Merge branch 'NotionX:master' into collection-view-calendar

NotionX · Oct 10, 2024 · d899d24 · d899d24
2 parents e6e62b6 + 3e8b41b
commit d899d24
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 31 deletions.
diff --git a/examples/cra/package.json b/examples/cra/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-x-example-cra",
-  "version": "6.16.0",
+  "version": "6.16.1",
   "private": true,
   "scripts": {
     "dev": "GENERATE_SOURCEMAP=false react-scripts start",
@@ -12,10 +12,10 @@
     "@types/node": "^16.11.26",
     "@types/react": "^17.0.43",
     "@types/react-dom": "^17.0.14",
-    "notion-types": "^6.15.6",
+    "notion-types": "^6.16.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-notion-x": "^6.16.0",
+    "react-notion-x": "^6.16.1",
     "react-scripts": "5.0.0",
     "typescript": "^4.6.3"
   },

diff --git a/examples/full/package.json b/examples/full/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-x-example-full",
-  "version": "6.16.0",
+  "version": "6.16.2",
   "private": true,
   "type": "commonjs",
   "scripts": {
@@ -18,14 +18,14 @@
     "got": "^12.0.2",
     "lqip-modern": "^1.2.0",
     "next": "^12.1.0",
-    "notion-client": "^6.16.0",
-    "notion-compat": "^6.16.0",
-    "notion-utils": "^6.16.0",
+    "notion-client": "^6.16.1",
+    "notion-compat": "^6.16.1",
+    "notion-utils": "^6.16.1",
     "p-map": "^5.3.0",
     "p-memoize": "^6.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-notion-x": "^6.16.0",
+    "react-notion-x": "^6.16.1",
     "react-tweet-embed": "^2.0.0"
   },
   "devDependencies": {

diff --git a/examples/full/pages/_app.tsx b/examples/full/pages/_app.tsx
@@ -7,6 +7,7 @@ import 'prismjs/themes/prism-tomorrow.css'
 // core styles shared by all of react-notion-x (required)
 import 'react-notion-x/src/styles.css'
 
+// force push
 import '../styles/globals.css'
 
 function MyApp({ Component, pageProps }) {

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-x-example-minimal",
-  "version": "6.16.0",
+  "version": "6.16.1",
   "private": true,
   "type": "commonjs",
   "scripts": {
@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "next": "^12.1.0",
-    "notion-client": "^6.16.0",
-    "notion-utils": "^6.16.0",
+    "notion-client": "^6.16.1",
+    "notion-utils": "^6.16.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-notion-x": "^6.16.0"
+    "react-notion-x": "^6.16.1"
   },
   "devDependencies": {
     "@types/node": "^16.11.2",

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.16.0",
+  "version": "6.16.2",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [

diff --git a/packages/notion-client/package.json b/packages/notion-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-client",
-  "version": "6.16.0",
+  "version": "6.16.1",
   "type": "module",
   "description": "Robust TypeScript client for the unofficial Notion API.",
   "repository": "NotionX/react-notion-x",
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "got": "^11.8.1",
-    "notion-types": "^6.16.0",
-    "notion-utils": "^6.16.0",
+    "notion-types": "^6.16.1",
+    "notion-utils": "^6.16.1",
     "p-map": "^5.3.0"
   },
   "ava": {

diff --git a/packages/notion-compat/package.json b/packages/notion-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-compat",
-  "version": "6.16.0",
+  "version": "6.16.1",
   "type": "module",
   "description": "Compatibility layer between the official Notion API and unofficial private API.",
   "repository": "NotionX/react-notion-x",
@@ -22,13 +22,13 @@
     "test": "ava"
   },
   "dependencies": {
-    "notion-types": "^6.16.0",
-    "notion-utils": "^6.16.0",
+    "notion-types": "^6.16.1",
+    "notion-utils": "^6.16.1",
     "p-queue": "^7.2.0"
   },
   "devDependencies": {
     "@notionhq/client": "^1.0.4",
-    "notion-client": "^6.16.0"
+    "notion-client": "^6.16.1"
   },
   "peerDependencies": {
     "@notionhq/client": "^1.0.4"

diff --git a/packages/notion-types/package.json b/packages/notion-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-types",
-  "version": "6.16.0",
+  "version": "6.16.1",
   "type": "module",
   "description": "TypeScript types for core Notion data structures.",
   "repository": "NotionX/react-notion-x",

diff --git a/packages/notion-utils/package.json b/packages/notion-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notion-utils",
-  "version": "6.16.0",
+  "version": "6.16.1",
   "type": "module",
   "description": "Useful utilities for working with Notion data. Isomorphic.",
   "repository": "NotionX/react-notion-x",
@@ -31,7 +31,7 @@
     "is-url-superb": "^6.1.0",
     "mem": "^9.0.2",
     "normalize-url": "^7.0.3",
-    "notion-types": "^6.16.0",
+    "notion-types": "^6.16.1",
     "p-queue": "^7.2.0"
   },
   "ava": {

diff --git a/packages/notion-utils/src/get-all-pages-in-space.ts b/packages/notion-utils/src/get-all-pages-in-space.ts
@@ -74,7 +74,7 @@ export async function getAllPagesInSpace(
           Object.keys(page.block)
             .filter((key) => {
               const block = page.block[key]?.value
-              if (!block) return false
+              if (!block || block.alive === false) return false
 
               if (
                 block.type !== 'page' &&

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": "6.16.0",
+  "version": "6.16.1",
   "type": "module",
   "description": "Fast and accurate React renderer for Notion.",
   "repository": "NotionX/react-notion-x",
@@ -25,8 +25,8 @@
     "@fisch0920/medium-zoom": "^1.0.7",
     "@matejmazur/react-katex": "^3.1.3",
     "katex": "^0.15.3",
-    "notion-types": "^6.16.0",
-    "notion-utils": "^6.16.0",
+    "notion-types": "^6.16.1",
+    "notion-utils": "^6.16.1",
     "prismjs": "^1.27.0",
     "react-fast-compare": "^3.2.0",
     "react-hotkeys-hook": "^3.0.3",

diff --git a/packages/react-notion-x/src/components/eoi.tsx b/packages/react-notion-x/src/components/eoi.tsx
@@ -63,8 +63,14 @@ export const EOI: React.FC<{
 
       <div className='notion-external-description'>
         <div className='notion-external-title'>{title}</div>
-
-        {(owner || lastUpdated) && (
+        {!inline && owner ? (
+          <div className='notion-external-block-desc'>
+            {owner}
+            {lastUpdated && <span> • </span>}
+            {lastUpdated && `Updated ${lastUpdated}`}
+          </div>
+        ) : null}
+        {inline && (owner || lastUpdated) && (
           <MentionPreviewCard
             title={title}
             owner={owner}

diff --git a/packages/react-notion-x/src/styles.css b/packages/react-notion-x/src/styles.css
@@ -2985,6 +2985,13 @@ svg.notion-page-icon {
   color: var(--fg-color-3);
 }
 
+.notion-external-block-desc {
+  color: rgba(55, 53, 47, 0.65);
+  font-size: 12px;
+  white-space: nowrap;
+  padding-top: 4px;
+}
+
 .notion-external-mention .notion-external-subtitle {
   display: none;
   position: absolute;

diff --git a/packages/react-notion-x/src/third-party/collection-card.tsx b/packages/react-notion-x/src/third-party/collection-card.tsx
@@ -29,8 +29,9 @@ export const CollectionCard: React.FC<CollectionCardProps> = ({
   } = ctx
   let coverContent = null
 
-  const { page_cover_position = 0.5 } = block.format || {}
+  const { page_cover_position = 0.5, card_cover_position = 0.5 } = block.format || {}
   const coverPosition = (1 - page_cover_position) * 100
+  const cardCoverPosition = (1 - card_cover_position) * 100
 
   if (cover?.type === 'page_content') {
     const contentBlockId = block.content?.find((blockId) => {
@@ -57,7 +58,8 @@ export const CollectionCard: React.FC<CollectionCardProps> = ({
             src={src}
             alt={caption || 'notion image'}
             style={{
-              objectFit: coverAspect
+              objectFit: coverAspect,
+              objectPosition: `center ${cardCoverPosition}%`  
             }}
           />
         )