@xyd-js/components 0.1.0-xyd.2 → 0.1.0-xyd.4

package/src/coder/CodeSample/CodeSample.tsx

@@ -1,150 +1,47 @@
-import React, {useEffect, useState} from "react";
-import * as TabsPrimitive from "@radix-ui/react-tabs"; // TODO: remove and use separation
-import {
-    AnnotationHandler,
-    InnerLine,
-    Pre,
-    highlight,
-    HighlightedCode,
-} from "codehike/code"
+import React from "react";
+import {Theme} from "@code-hike/lighter";
+
+import type {CodeThemeBlockProps} from "../CodeTheme";
 
 import {
-    CodeCopy,
-} from "../CodeCopy";
-import {theme as defaultTheme} from "./default-theme" // TODO: support multiple themes
-import {withLocalStored} from "./withLocalStored";
+    Code,
+    annotations,
+} from "../Code"
 import {
-    $sample,
-    $languages,
-    $code,
-    $mark,
-    $lineNumber
-} from "./CodeSample.styles";
-
-// TODO: try to use codehiki in build time / ASYNC !!! - we need rr server-components
-// TODO: separate highlight
-
-export interface MDXCodeSampleBlock {
-    /** This is the raw code. May include annotation comments. */
-    value: string;
-    /** The programming language. */
-    lang: string;
-    /** Metadata string (the content after the language name in a markdown codeblock). */
-    meta: string;
-}
+    withCodeTabs
+} from "../CodeTabs";
+import {useCodeTheme} from "../CodeTheme";
 
 export interface CodeSampleProps {
     name: string;
     description: string;
-    codeblocks: MDXCodeSampleBlock[];
+    codeblocks: CodeThemeBlockProps[];
     size?: "full"
+    theme?: Theme
 }
 
 export function CodeSample(props: CodeSampleProps) {
-    const [highlighted, setHighlighted] = useState<HighlightedCode[]>([]);
-
-    useEffect(() => {
-        async function fetchHighlight() {
-            const result = await Promise.all(
-                props.codeblocks?.map((codeblock) => highlight(codeblock, defaultTheme))
-            );
-
-            setHighlighted(result);
-        }
-
-        fetchHighlight();
-    }, [props.codeblocks]);
-
-    if (highlighted.length === 0) {
-        return <div>Loading</div>;
-    }
-
-    if (!highlighted) {
-        return <div>Loading</div>;
-    }
-
-    return (
-        <TabsPrimitive.Root
-            className={$sample.host}
-            style={highlighted[0]?.style}
-            defaultValue={highlighted[0]?.meta}
-            // localStorageKey={`preferredLanguage[${name}]`}
-        >
-            <div className={$languages.host}>
-                <$Description description={props.description}/>
-
-                <TabsPrimitive.List className={$languages.list}>
-                    {props.codeblocks?.map(({meta}, i) => (
-                        <TabsPrimitive.Trigger value={meta!} key={i} className={$languages.button}>
-                            {meta}
-                        </TabsPrimitive.Trigger>
-                    ))}
-                </TabsPrimitive.List>
-
-                <div className={$languages.copy}>
-                    {props.codeblocks?.map((codeblock, i) => (
-                        <TabsPrimitive.Content value={codeblock.meta!} asChild key={i}>
-                            <CodeCopy text={codeblock.value}/>
-                        </TabsPrimitive.Content>
-                    ))}
-                </div>
-            </div>
-
-            {highlighted?.map((codeblock, i) => (
-                <TabsPrimitive.Content value={codeblock.meta} key={i}>
-                    <Pre
-                        className={`
-                            ${$code.host}
-                            ${props?.size === "full" && $code.host$$full}
-                        `}
-                        style={codeblock?.style || codeblock?.style}
-                        code={codeblock}
-                        handlers={[mark, lineNumber]}
-                    />
-                </TabsPrimitive.Content>
-            ))}
-        </TabsPrimitive.Root>
-    )
+    return <Code codeblocks={props.codeblocks} theme={props.theme}>
+        <$ThemedCodeSample {...props}/>
+    </Code>
 }
 
-function $Description(props: { description: string }) {
-    return <div className={$languages.description}>
-        <div className={$languages.description$item}>
-            {props.description}
-        </div>
-    </div>
-}
+function $ThemedCodeSample(props: CodeSampleProps) {
+    const {highlighted} = useCodeTheme()
 
-const mark: AnnotationHandler = {
-    name: "Mark",
-    Line: ({annotation, ...props}) => {
-        return (
-            <div className={`${$mark.host} ${annotation && $mark.$$annotated}`}>
-                <InnerLine
-                    merge={props}
-                    className={$mark.line}
-                />
-            </div>
-        )
-    },
+    return <$CodeSampleTabs
+        description={props.description}
+        highlighted={highlighted}
+        size={props.size}
+    />
 }
 
-const lineNumber: AnnotationHandler = {
-    name: "LineNumber",
-    Line: ({annotation, ...props}) => {
-        const width = props.totalLines.toString().length + 1
-
-        return (
-            <>
-        <span
-            style={{minWidth: `${width}ch`}}
-            className={$lineNumber.host}
-        >
-          {props.lineNumber}
-        </span>
-                <InnerLine merge={props}/>
-            </>
-        )
-    },
-}
+const $CodeSampleTabs = withCodeTabs((props) => <Code.Pre
+    {...props}
+    handlers={[
+        annotations.mark,
+        annotations.bg,
+        annotations.lineNumbers
+    ]}
+/>)
 

package/src/coder/CodeSample/index.ts

@@ -8,5 +8,4 @@ export {
 
 export type {
     CodeSampleProps,
-    MDXCodeSampleBlock,
 } from "./CodeSample";

package/src/coder/CodeSample/withLocalStored.tsx

@@ -7,7 +7,7 @@ export interface CodeTabsProps {
     children: React.ReactNode
 }
 
-// TODO: interface
+// TODO: move to CodeTabs?
 export function withLocalStored(Component: any) {
     return function LocalStored(props: CodeTabsProps) {
         const [value, setValue] = useState(

package/src/coder/{CodeSample/CodeSample.styles.tsx → CodeTabs/CodeTabs.styles.tsx}

@@ -87,51 +87,3 @@ export const $languages = {
     `
 }
 
-export const $code = {
-    host: css`
-        max-height: 400px;
-        background: linear-gradient(45deg, rgb(247, 247, 248) 0%, rgb(247, 247, 248) 100%) !important;
-
-        margin: 0;
-        padding: 8px 16px;
-
-        border-top: 1px solid rgb(236, 236, 241);
-        border-bottom-left-radius: 10px;
-        border-bottom-right-radius: 10px;
-
-        font-size: 12px;
-        line-height: 20px;
-        white-space: pre-wrap;
-        word-break: break-all;
-
-        overflow-y: scroll;
-    `,
-    host$$full: css`
-        max-height: 100%;   
-    `
-}
-
-export const $mark = {
-    host: css`
-        display: flex;
-        border-left-width: 4px;
-        border-color: transparent;
-        margin: 4px 0;
-    `,
-    line: css`
-        flex: 1 1 0%;
-    `,
-    $$annotated: css`
-        border-color: #60A5FA;
-        background-color: #EEF2FF;
-    `
-}
-
-export const $lineNumber = {
-    host: css`
-        margin: 0 4px;
-        //text-align: right;
-        user-select: none;
-        opacity: 0.5;
-    `
-}

package/src/coder/CodeTabs/CodeTabs.tsx

@@ -0,0 +1,82 @@
+import React, {} from "react";
+import * as TabsPrimitive from "@radix-ui/react-tabs";
+import {
+    HighlightedCode,
+} from "codehike/code"
+
+import {
+    CodeCopy,
+} from "../CodeCopy";
+import {
+    $sample,
+    $languages,
+} from "./CodeTabs.styles.tsx"; // TODO: style by highlighted?
+
+export interface CodeTabsProps {
+    description: string;
+    highlighted: HighlightedCode[]
+    size?: "full"
+}
+
+export function withCodeTabs(PreComponent) {
+    return function CodeTabs(props: CodeTabsProps) {
+        return (
+            <TabsPrimitive.Root
+                className={$sample.host}
+                style={props.highlighted[0]?.style}
+                defaultValue={props.highlighted[0]?.meta}
+            >
+                <$LanguageTabSwitcher
+                    description={props.description}
+                    highlighted={props.highlighted}
+                />
+
+                {props.highlighted?.map((codeblock, i) => (
+                    <TabsPrimitive.Content value={codeblock.meta} key={i}>
+                        <PreComponent
+                            style={codeblock?.style || codeblock?.style}
+                            codeblock={codeblock}
+                        />
+                    </TabsPrimitive.Content>
+                ))}
+            </TabsPrimitive.Root>
+        )
+    }
+}
+
+interface LanguageTabSwitcherProps {
+    description: string;
+    highlighted: HighlightedCode[]
+}
+
+function $LanguageTabSwitcher(props: LanguageTabSwitcherProps) {
+    return <div className={$languages.host}>
+        <$Description description={props.description}/>
+
+        <TabsPrimitive.List className={$languages.list}>
+            {props.highlighted?.map(({meta}, i) => (
+                <TabsPrimitive.Trigger value={meta!} key={i} className={$languages.button}>
+                    {meta}
+                </TabsPrimitive.Trigger>
+            ))}
+        </TabsPrimitive.List>
+
+        <div className={$languages.copy}>
+            {props.highlighted?.map((codeblock, i) => (
+                <TabsPrimitive.Content value={codeblock.meta!} asChild key={i}>
+                    <CodeCopy text={codeblock.value}/>
+                </TabsPrimitive.Content>
+            ))}
+        </div>
+    </div>
+}
+
+function $Description(props: { description: string }) {
+    return <div className={$languages.description}>
+        <div className={$languages.description$item}>
+            {props.description}
+        </div>
+    </div>
+}
+
+

package/src/coder/CodeTabs/index.ts

@@ -0,0 +1,6 @@
+export type {
+    CodeTabsProps
+} from "./CodeTabs";
+export {
+    withCodeTabs
+} from "./CodeTabs";

package/src/coder/CodeTheme/CodeTheme.tsx

@@ -0,0 +1,78 @@
+import React, { createContext, useState, use, useEffect } from "react";
+import { Theme } from "@code-hike/lighter";
+import { highlight } from "codehike/code";
+import type { HighlightedCode } from "codehike/code";
+
+import defaultTheme from "../themes/cosmo-light"
+
+export interface CodeThemeProps {
+  codeblocks: CodeThemeBlockProps[];
+  children: React.ReactNode;
+  theme?: Theme;
+}
+
+export interface CodeThemeBlockProps {
+  /** This is the raw code. May include annotation comments. */
+  value: string;
+  /** The programming language. */
+  lang: string;
+  /** Metadata string (the content after the language name in a markdown codeblock). */
+  meta: string;
+}
+
+const CodeThemeProvider = createContext<{
+  highlighted: HighlightedCode[];
+}>({
+  highlighted: [],
+});
+
+export function useCodeTheme() {
+  return use(CodeThemeProvider);
+}
+
+export function CodeTheme(props: CodeThemeProps) {
+  const highlighted = use(
+    fetchHighlight(props.codeblocks, props.theme || defaultTheme)
+  );
+
+  return (
+    <CodeThemeProvider
+      value={{
+        highlighted,
+      }}
+    >
+      {props.children}
+    </CodeThemeProvider>
+  );
+}
+
+// `CodeThemeSync` ?
+export function CodeThemeCSR(props: CodeThemeProps) {
+  const [highlighted, setHighlighted] = useState<HighlightedCode[]>([]);
+
+  useEffect(() => {
+    fetchHighlight(props.codeblocks, props.theme || defaultTheme).then(
+      setHighlighted
+    );
+  }, [props.codeblocks, props.theme]);
+
+  if (!highlighted) {
+    return <div>loading${`...`}</div>;
+  }
+
+  return (
+    <CodeThemeProvider
+      value={{
+        highlighted,
+      }}
+    >
+      {props.children}
+    </CodeThemeProvider>
+  );
+}
+
+async function fetchHighlight(codeblocks: CodeThemeBlockProps[], theme: Theme) {
+  return await Promise.all(
+    codeblocks?.map((codeblock) => highlight(codeblock, theme))
+  );
+}

package/src/coder/CodeTheme/index.ts

@@ -0,0 +1,8 @@
+export type {CodeThemeProps, CodeThemeBlockProps} from "./CodeTheme";
+
+export {
+    CodeTheme,
+    CodeThemeCSR,
+
+    useCodeTheme
+} from "./CodeTheme";

package/src/coder/index.ts

@@ -1,3 +1,33 @@
+export {
+    annotations
+} from "./Code"
+export type {
+    CodeProps
+} from "./Code"
+export {
+    Code
+} from "./Code"
+export {
+    highlight
+} from "./Code"
+//
+
+export type {CodeSampleProps} from "./CodeSample";
 export {CodeSample} from "./CodeSample";
+//
+
+export type {
+    CodeTabsProps
+} from "./CodeTabs";
+export {
+    withCodeTabs
+} from "./CodeTabs";
+//
+
+export type {CodeThemeProps, CodeThemeBlockProps} from "./CodeTheme";
+export {
+    CodeTheme,
+    CodeThemeCSR,
 
-export type {CodeSampleProps} from "./CodeSample";
+    useCodeTheme
+} from "./CodeTheme";

package/src/coder/{CodeSample/default-theme.ts → themes/cosmo-light.ts}

@@ -2,7 +2,8 @@
 
 import {Theme} from "@code-hike/lighter";
 
-export const theme: Theme = {
+export default {
+    name: "cosmo-light",
     type: "light",
     colors: {
         "list.focusForeground": "#FFFFFF",
@@ -263,4 +264,4 @@ export const theme: Theme = {
             },
         },
     ],
-}
+} as Theme

package/src/content/Content/Content.tsx

@@ -5,6 +5,7 @@ const $content = {
     host: css`
         display: flex;
         flex-direction: column;
+        //align-items: center;
         gap: 24px;
     `
 }

package/src/content/Content.tsx

@@ -18,6 +18,17 @@ import {
     IconFunnels,
     IconMetrics,
     IconSessionReplay,
+    IconAlert,
+    IconBrowser,
+    IconREST,
+    IconGraphQL,
+    IconWebhooks,
+    IconJSBrowser,
+    IconJSNode,
+    IconStorybook,
+    IconReactRouter,
+    IconNextJS,
+    IconAppTemplate
 } from '../writer'
 import {CodeSample} from "../coder";
 
@@ -27,7 +38,7 @@ import {Anchor} from "./Anchor";
 
 const EXTERNAL_HREF_REGEX = /https?:\/\//
 
-const Link = ({href = '', className, ...props}) => (
+const Link = ({href = '', className = "", ...props}) => (
     <Anchor
         href={href}
         newWindow={EXTERNAL_HREF_REGEX.test(href)}
@@ -43,6 +54,7 @@ export default function content() {
         ...helperContent(),
         ...iconContent(),
         ...coderContent(),
+        ...directiveContent(),
     }
 }
 
@@ -113,6 +125,17 @@ export function writerContent() {
     }
 }
 
+export function directiveContent() {
+    return {
+        DirectiveCodeSample: (props) => {
+            return <CodeSample
+                {...props}
+                codeblocks={JSON.parse(props.codeblocks)}
+            />
+        }
+    }
+}
+
 export function helperContent() {
     return {
         Content: ContentComponent,
@@ -127,6 +150,17 @@ export function iconContent() {
         IconFunnels,
         IconCode,
         IconCustomEvent,
+        IconAlert,
+        IconBrowser,
+        IconREST,
+        IconGraphQL,
+        IconWebhooks,
+        IconJSBrowser,
+        IconJSNode,
+        IconStorybook,
+        IconReactRouter,
+        IconNextJS,
+        IconAppTemplate,
     }
 }
 

package/src/pages/index.ts

@@ -1 +1,2 @@
+// TODO: rename to @xyd-js/components/themes . `HomePage` -> `BaseTheme`
 export * from "./HomePage"

package/src/views/index.ts

@@ -1 +1,2 @@
+// TODO: rename to @xyd-js/components/pages
 export * from "./HomeView";

package/src/writer/Badge/Badge.styles.tsx

@@ -15,6 +15,10 @@ export const $badge = {
         color: #000;
         background-color: #f8d047;
     `,
+    host$$info: css`
+        color: #fff;
+        background-color: #1FA6F2;
+    `,
     host$$sm: css`
         font-size: 12px;
         height: 18px;

package/src/writer/Badge/Badge.tsx

@@ -6,7 +6,7 @@ export interface BadgeProps {
     children: React.ReactNode;
 
     size?: "sm"
-    kind?: "warning"
+    kind?: "warning" | "info"
 }
 
 export function Badge({
@@ -20,6 +20,8 @@ export function Badge({
         ${size === "sm" && $badge.host$$sm}
         
         ${kind === "warning" && $badge.host$$warning}
+        
+        ${kind === "info" && $badge.host$$info}
     `}>
         <span className={$badge.item}>
             {children}