Merge branch 'refs/heads/main' into releases

# Conflicts:
#	docs/package.json
#	lerna.json
#	package-lock.json
#	packages/ariakit/package.json
#	packages/core/package.json
#	packages/mantine/package.json
#	packages/react/package.json
#	packages/shadcn/package.json
#	playground/package.json
#	tests/package.json

Author: matthewlipski

docs/auth.ts

@@ -10,11 +10,27 @@ export const {
   callbacks: {
     signIn: async (params) => {
       if (params.profile!.sponsorInfo) {
-        // TODO
+        // user is sponsor
         return true;
       }
+      // user is signed in to github, but not a sponsor.
+      // TODO: We could redirect to pricing page here
       return true;
-      return "https://github.com/sponsors/TypeCellOS"; // TODO
+      // return "https://www.blocknotejs.org/pricing";
+    },
+    // https://authjs.dev/guides/extending-the-session
+    jwt({ token, user }) {
+      if (user) {
+        // User is available during sign-in
+        token.sponsorInfo = (user as any).sponsorInfo;
+      }
+      return token;
+    },
+    session: async (params) => {
+      (params.session.user as any).sponsorInfo = (
+        params.token as any
+      ).sponsorInfo;
+      return params.session;
     },
   },
   providers: [
@@ -55,9 +71,11 @@ export const {
               "Content-Type": "application/json",
               Authorization: `Bearer ${tokens.access_token}`,
             },
+            // organization(login:"TypeCellOS") {
+            // user(login:"YousefED") {
             body: JSON.stringify({
               query: `{
-                organization(login:"TypeCellOS") {
+                user(login:"YousefED") {
                   sponsorshipForViewerAsSponsor(activeOnly:false) {
                     isActive,
                     tier {
@@ -71,10 +89,35 @@ export const {
           });
 
           if (resSponsor.ok) {
+            // Mock data. TODO: disable and test actial data
+            // profile.sponsorInfo = {
+            //   isActive: true,
+            //   tier: {
+            //     name: "test",
+            //     monthlyPriceInDollars: 100,
+            //   },
+            // };
+            // use API data:
+
             const data = await resSponsor.json();
+            // eslint-disable-next-line no-console
+            console.log("sponsor data", data);
+
+            // {
+            //   "data": {
+            //     "user": {
+            //       "sponsorshipForViewerAsSponsor": {
+            //         "isActive": true,
+            //         "tier": {
+            //           "name": "$90 a month",
+            //           "monthlyPriceInDollars": 90
+            //         }
+            //       }
+            //     }
+            //   }
+            // }
 
-            profile.sponsorInfo =
-              data.data.organization.sponsorshipForViewerAsSponsor;
+            profile.sponsorInfo = data.data.user.sponsorshipForViewerAsSponsor;
           }
 
           return profile;
@@ -87,7 +130,7 @@ export const {
           email: profile.email,
           image: profile.avatar_url,
           username: profile.login,
-          sponsorInfo: profile.sponsorsTypeCell,
+          sponsorInfo: profile.sponsorInfo,
         };
       },
     }),

docs/components/AuthNavButton.tsx

@@ -41,14 +41,15 @@ export function AuthNavButton(props: any) {
       />
     </NavbarMenu>
   ) : (
-    <></>
-    // TODO: design button
-    // <button
-    //   onClick={async () => {
-    //     await signIn("github");
-    //   }}>
-    //   Sign in
-    // </button>
+    <>
+      {/* TODO: move to footer */}{" "}
+      {/* <button
+        onClick={async () => {
+          await signIn("github", {});
+        }}>
+        Sign in
+      </button> */}
+    </>
   );
 }
 

docs/components/cards.tsx

@@ -6,17 +6,17 @@ import type { ComponentProps, CSSProperties, ReactNode } from "react";
 const classes = {
   cards: cn(
     "nextra-cards nx-mt-4 nx-gap-4 nx-grid",
-    "nx-not-prose" // for nextra-theme-docs
+    "nx-not-prose", // for nextra-theme-docs
   ),
   card: cn(
     "nextra-card nx-group nx-flex nx-flex-col nx-justify-between nx-overflow-hidden nx-rounded-lg nx-border nx-border-gray-200",
     "nx-text-current nx-no-underline dark:nx-shadow-none",
     "hover:nx-shadow-gray-100 dark:hover:nx-shadow-none nx-shadow-gray-100",
     "active:nx-shadow-sm active:nx-shadow-gray-200",
-    "nx-transition-all nx-duration-200 hover:nx-border-gray-300"
+    "nx-transition-all nx-duration-200 hover:nx-border-gray-300",
   ),
   title: cn(
-    "nx-flex nx-font-semibold nx-items-start nx-text-gray-700 hover:nx-text-gray-900"
+    "nx-flex nx-font-semibold nx-items-start nx-text-gray-700 hover:nx-text-gray-900",
   ),
 };
 
@@ -54,14 +54,14 @@ export function Card({
         href={href}
         className={cn(
           classes.card,
-          "nx-bg-gray-100 nx-shadow dark:nx-border-neutral-700 dark:nx-bg-neutral-800 dark:nx-text-gray-50 hover:nx-shadow-lg dark:hover:nx-border-neutral-500 dark:hover:nx-bg-neutral-700"
+          "nx-bg-gray-100 nx-shadow dark:nx-border-neutral-700 dark:nx-bg-neutral-800 dark:nx-text-gray-50 hover:nx-shadow-lg dark:hover:nx-border-neutral-500 dark:hover:nx-bg-neutral-700",
         )}
         {...props}>
         {children}
         <span
           className={cn(
             classes.title,
-            "dark:nx-text-gray-300 dark:hover:nx-text-gray-100"
+            "dark:nx-text-gray-300 dark:hover:nx-text-gray-100",
           )}>
           {icon}
           <span className="nx-flex nx-gap-1">
@@ -79,21 +79,29 @@ export function Card({
       className={cn(
         classes.card,
         "nx-bg-transparent nx-shadow-sm dark:nx-border-neutral-800 hover:nx-bg-slate-50 hover:nx-shadow-md dark:hover:nx-border-neutral-700 dark:hover:nx-bg-neutral-900",
-        "nx-flex  nx-items-start nx-gap-2 nx-p-4 nx-text-gray-700"
+        "nx-flex  nx-items-start nx-gap-2 nx-p-4 nx-text-gray-700",
       )}
       {...props}>
       <span
         className={cn(
           classes.title,
-          "dark:nx-text-neutral-200 dark:hover:nx-text-neutral-50 nx-flex nx-items-center"
+          "dark:nx-text-neutral-200 dark:hover:nx-text-neutral-50 nx-flex nx-items-center",
         )}>
-        {icon}
         {title}
+        {icon}
         {animatedArrow}
       </span>
       {/* <div className="hover:nx-text-gray-900 nx-items-right">test</div> */}
-      <div className="text-xs nx-flex nx-items-center nx-gap-2">
-        {authorImage && <Image className="rounded-md size-5" width={50} height={50} src={authorImage} alt={authorName + " profile image"} />}{" "}
+      <div className="nx-flex nx-items-center nx-gap-2 text-xs">
+        {authorImage && (
+          <Image
+            className="size-5 rounded-md"
+            width={50}
+            height={50}
+            src={authorImage}
+            alt={authorName + " profile image"}
+          />
+        )}{" "}
         {authorName && <span>{authorName}</span>}
         {/* <span>·</span>
         <span>💖</span> */}

docs/components/example/ExampleBlock.tsx

@@ -1,8 +1,13 @@
+import { signIn } from "next-auth/react";
 import dynamic from "next/dynamic";
 import { AiFillGithub } from "react-icons/ai";
 import { SiStackblitz } from "react-icons/si";
 
+import CTAButton from "../../components/pages/landing/shared/CTAButton";
+import { SectionHeader } from "../../components/pages/landing/shared/Headings";
 import { examples } from "./generated/exampleComponents.gen";
+
+import "../pages/landing/gradients.css";
 import "./styles.css";
 
 const baseGitHubURL = "https://github.com/TypeCellOS/BlockNote/tree/main/";
@@ -20,38 +25,83 @@ export function ExampleBlock(props: {
   name: keyof typeof examples;
   path: string;
   children: any;
+  isProExample?: {
+    userStatus: "business" | "starter" | "free" | undefined;
+  };
 }) {
-  // const example = examplesFlattened.find((e) => e.slug === props.name);
-  // if (!example) {
-  //   throw new Error("invalid example");
-  // }
+  const showCode =
+    !props.isProExample ||
+    props.isProExample.userStatus === "starter" ||
+    props.isProExample.userStatus === "business";
 
   return (
     <div className="demo nx-bg-primary-700/5 dark:nx-bg-primary-300/10 mt-6 rounded-lg p-4">
-      <div className={"flex flex-row gap-6 pb-4"}>
-        <a
-          className={
-            "nx-select-none nx-text-gray-600 hover:nx-text-black dark:nx-text-gray-200 dark:hover:nx-text-white flex flex-row items-center gap-1"
-          }
-          href={`${baseGitHubURL}${props.path}/`}
-          target="_blank">
-          <AiFillGithub />
-          <div className={"text-sm"}>GitHub</div>
-        </a>
-        <a
-          className={
-            "nx-select-none nx-text-gray-600 hover:nx-text-black dark:nx-text-gray-200 dark:hover:nx-text-white flex flex-row items-center gap-1"
-          }
-          href={`${baseStackBlitzURL}${props.path}/`}
-          target="_blank">
-          <SiStackblitz />
-          <div className={"text-sm"}>StackBlitz</div>
-        </a>
-      </div>
+      {showCode && (
+        <div className={"z-10 flex flex-row gap-6 pb-4"}>
+          <a
+            className={
+              "nx-select-none nx-text-gray-600 hover:nx-text-black dark:nx-text-gray-200 dark:hover:nx-text-white flex flex-row items-center gap-1"
+            }
+            href={`${baseGitHubURL}${props.path}/`}
+            target="_blank">
+            <AiFillGithub />
+            <div className={"text-sm"}>GitHub</div>
+          </a>
+          <a
+            className={
+              "nx-select-none nx-text-gray-600 hover:nx-text-black dark:nx-text-gray-200 dark:hover:nx-text-white flex flex-row items-center gap-1"
+            }
+            href={`${baseStackBlitzURL}${props.path}/`}
+            target="_blank">
+            <SiStackblitz />
+            <div className={"text-sm"}>StackBlitz</div>
+          </a>
+        </div>
+      )}
       <div className={"demo-contents h-96 overflow-auto rounded-lg"}>
         <ThemedExample name={props.name} />
       </div>
-      {props.children}
+      {showCode ? (
+        props.children
+      ) : (
+        <div
+          className={
+            "relative flex h-96 flex-col items-center justify-center gap-2"
+          }>
+          <div className={"absolute h-1/2 w-1/2"}>
+            <div className={"cta-glow  h-full w-full"}></div>
+          </div>
+          <div className={"z-10 flex w-2/3 flex-col items-center"}>
+            <SectionHeader>Pro Example</SectionHeader>
+            <p className={"text-center text-[#00000080] dark:text-[#FFFFFFB2]"}>
+              Get access to the full source code for pro examples by subscribing
+              to BlockNote Pro
+            </p>
+            <div className={"mt-8"}>
+              <CTAButton
+                href={"/pricing"}
+                color={"pro"}
+                size={"large"}
+                hoverGlow={true}>
+                Get BlockNote Pro
+              </CTAButton>
+            </div>
+            {!props.isProExample?.userStatus && (
+              <p className={"mt-1 text-xs"}>
+                Or{" "}
+                <button
+                  className={"nx-text-primary-600"}
+                  onClick={async () => {
+                    await signIn("github", {});
+                  }}>
+                  sign in
+                </button>{" "}
+                via GitHub
+              </p>
+            )}
+          </div>
+        </div>
+      )}
     </div>
   );
 }

docs/components/example/ExampleList.tsx

@@ -1,5 +1,7 @@
 import { Card, Cards } from "../../components/cards";
 import { EXAMPLES_LIST } from "../../components/example/generated/exampleList.gen";
+import { ProBadge } from "../../components/example/ProBadge";
+import { proExamplesList } from "../../components/example/proExamplesList";
 
 export function ExampleGroup(props: { examples: (typeof EXAMPLES_LIST)[0] }) {
   return (
@@ -14,6 +16,7 @@ export function ExampleGroup(props: { examples: (typeof EXAMPLES_LIST)[0] }) {
               key={i}
               title={project.text}
               href={project.link}
+              icon={proExamplesList.includes(project.text) && <ProBadge />}
               authorName={project.author}
               authorImage={`https://github.com/${project.author}.png`}
             />

docs/components/example/ProBadge.tsx

@@ -0,0 +1,7 @@
+export function ProBadge() {
+  return (
+    <span className="nx-rounded-full mx-1 inline-flex items-center bg-indigo-600/10 px-1.5 text-xs font-medium text-indigo-600 ring-1 ring-inset ring-indigo-600">
+      Pro
+    </span>
+  );
+}

docs/components/example/index.tsx

@@ -1,12 +1,20 @@
+import { useSession } from "next-auth/react";
+import { getProLevel } from "../../util/authUtil";
 import { examples } from "./generated/exampleComponents.gen";
 
 export function Example(props: { name: keyof typeof examples }) {
-  
+  const session = useSession();
   const example = examples[props.name];
   if (!example) {
     throw new Error(`Example ${props.name} not found`);
   }
   const ExampleWithCode = example.ExampleWithCode;
+  const userStatus = getProLevel(session);
 
-  return <ExampleWithCode name={props.name} />;
+  return (
+    <ExampleWithCode
+      name={props.name}
+      isProExample={example.pro ? { userStatus } : undefined}
+    />
+  );
 }

docs/components/example/proExamplesList.ts

@@ -0,0 +1,11 @@
+import { EXAMPLES_LIST } from "@/components/example/generated/exampleList.gen";
+import { examples } from "@/components/example/generated/exampleComponents.gen";
+
+export const proExamplesList = ([] as (typeof EXAMPLES_LIST)[number]["items"])
+  .concat(...EXAMPLES_LIST.map((example) => example.items))
+  .filter((example) => {
+    return examples[
+      example.link.replace("/examples/", "") as keyof typeof examples
+    ].pro;
+  })
+  .map((example) => example.text);

docs/components/pages/landing/faq/FAQ.tsx

@@ -1,6 +1,6 @@
-import { Link } from "nextra-theme-docs";
 import { SectionIntro } from "@/components/pages/landing/shared/Headings";
 import { Section } from "@/components/pages/landing/shared/Section";
+import { Link } from "nextra-theme-docs";
 
 const faqs = [
   {
@@ -24,7 +24,7 @@ const faqs = [
     id: 4,
     question: "Is BlockNote really free?",
     answer: `100% of BlockNote is open source. While the library is free, we offer paid consultancy and support services to help sustain BlockNote.   
-    Sponsoring the project is encouraged if you are using BlockNote in a commercial project.`,
+    If you are using BlockNote in a commercial project, we encourage to sign up for BlockNote Pro!`,
   },
 ];