polen 0.9.0-next.4 → 0.9.0-next.6

package/src/template/routes/root.tsx

@@ -1,7 +1,7 @@
 import type { ReactRouter } from '#dep/react-router/index'
 import { createRoute } from '#lib/react-router-aid/react-router-aid'
 import { GitHubLogoIcon } from '@radix-ui/react-icons'
-import { Box, Button, Heading, Text } from '@radix-ui/themes'
+import { Box, Button, Grid, Heading, Text } from '@radix-ui/themes'
 import { Flex, Theme } from '@radix-ui/themes'
 import radixStylesUrl from '@radix-ui/themes/styles.css?url'
 import { Arr } from '@wollybeard/kit'
@@ -75,53 +75,97 @@ const Layout = () => {
 
   const currentNavPathExp = getCurrentNavPathExp()
   const sidebar = currentNavPathExp && projectDataPages.sidebarIndex[currentNavPathExp]
-  const showSidebar = sidebar && sidebar.items.length > 0
+  const isShowSidebar = sidebar && sidebar.items.length > 0
+
+  const header = (
+    <Flex
+      gridArea={'header'}
+      align='center'
+      gap='8'
+      pb='4'
+      mb='8'
+      style={{
+        borderBottom: `1px solid var(--gray-3)`,
+      }}
+    >
+      <LinkReactRouter
+        to='/'
+        style={{ color: `inherit`, textDecoration: `none` }}
+      >
+        <Flex align='center' gap='2'>
+          <GitHubLogoIcon style={{ width: 30, height: 30 }} />
+          <Text size='3' weight='medium'>
+            {templateVariables.title}
+          </Text>
+        </Flex>
+      </LinkReactRouter>
+      <Flex direction='row' gap='4'>
+        {projectDataNavbar.map((item, key) => (
+          <Link key={key} color='gray' to={item.pathExp}>
+            {item.title}
+          </Link>
+        ))}
+      </Flex>
+    </Flex>
+  )
+
   return (
     <Theme asChild>
-      <Box m='8'>
-        <Flex
-          align='center'
-          gap='8'
-          pb='4'
-          mb='8'
-          style={{
-            borderBottom: `1px solid var(--gray-3)`,
-          }}
-        >
-          <LinkReactRouter
-            to='/'
-            style={{ color: `inherit`, textDecoration: `none` }}
-          >
-            <Flex align='center' gap='2'>
-              <GitHubLogoIcon style={{ width: 30, height: 30 }} />
-              <Text size='3' weight='medium'>
-                {templateVariables.title}
-              </Text>
-            </Flex>
-          </LinkReactRouter>
-          <Flex direction='row' gap='4'>
-            {projectDataNavbar.map((item, key) => (
-              <Link key={key} color='gray' to={item.pathExp}>
-                {item.title}
-              </Link>
-            ))}
-          </Flex>
-        </Flex>
-        {showSidebar
-          ? (
-            <Flex gap='8'>
-              <Sidebar items={sidebar.items} />
-              <Box style={{ flex: 1 }}>
-                <Outlet />
-              </Box>
-            </Flex>
-          )
-          : (
-            <Box>
-              <Outlet />
-            </Box>
-          )}
-      </Box>
+      <Grid
+        width={{ initial: 'var(--container-4)' }}
+        areas="'header header header header header header header header' 'sidebar sidebar . content content content content content'"
+        rows='min-content auto'
+        columns='repeat(8, 1fr)'
+        gapX='2'
+        my='8'
+        mx='auto'
+      >
+        <style>{`
+          /* Shiki code blocks */
+          pre.shiki {
+            margin: 1rem 0;
+            padding: 1rem;
+            border-radius: 8px;
+            overflow-x: auto;
+            font-size: 14px;
+            line-height: 1.6;
+            background-color: #f6f8fa;
+          }
+          
+          /* Light mode: use --shiki-light CSS variables from inline styles */
+          pre.shiki span {
+            color: var(--shiki-light);
+          }
+          
+          /* Dark mode - Radix Themes uses [data-is-root-theme="dark"] */
+          [data-is-root-theme="dark"] pre.shiki {
+            background-color: #1a1b26;
+          }
+          
+          [data-is-root-theme="dark"] pre.shiki span {
+            color: var(--shiki-dark);
+          }
+          
+          pre.shiki code {
+            font-family: 'JetBrains Mono', 'Fira Code', 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
+            background: transparent;
+            display: block;
+          }
+        `}</style>
+        {header}
+        {isShowSidebar && (
+          <Sidebar
+            gridColumn='1 / 3'
+            gridRow='2 / auto'
+            data={sidebar.items}
+            // ml='-100px'
+            // style={{ transform: 'translate(calc(-100% - var(--space-8)))' }}
+          />
+        )}
+        <Box gridArea='content / content / auto / 8'>
+          <Outlet />
+        </Box>
+      </Grid>
     </Theme>
   )
 }

package/src/template/styles/code-block.css

@@ -0,0 +1,186 @@
+/* Code Block Styles */
+
+/* Base code block container */
+.code-block {
+  position: relative;
+  margin: 1rem 0;
+  border-radius: 8px;
+  overflow: hidden;
+  font-size: 14px;
+  line-height: 1.6;
+}
+
+.code-block pre {
+  margin: 0;
+  padding: 1rem;
+  overflow-x: auto;
+  background: inherit;
+}
+
+.code-block code {
+  font-family: 'JetBrains Mono', 'Fira Code', 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
+  font-variant-ligatures: contextual;
+}
+
+/* Shiki theme switching with CSS variables */
+/* Default to light theme */
+:root {
+  color-scheme: light;
+}
+
+/* When dark mode is active */
+.dark {
+  color-scheme: dark;
+}
+
+/* Shiki code blocks */
+pre.shiki {
+  margin: 1rem 0;
+  padding: 1rem;
+  border-radius: 8px;
+  overflow-x: auto;
+  font-size: 14px;
+  line-height: 1.6;
+}
+
+pre.shiki code {
+  font-family: 'JetBrains Mono', 'Fira Code', 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
+  font-variant-ligatures: contextual;
+}
+
+/* Line numbers */
+.code-block[data-line-numbers="true"] pre {
+  padding-left: 3.5rem;
+  position: relative;
+}
+
+.code-block[data-line-numbers="true"] .line {
+  position: relative;
+}
+
+.code-block[data-line-numbers="true"] .line::before {
+  content: attr(data-line);
+  position: absolute;
+  left: -3rem;
+  width: 2.5rem;
+  text-align: right;
+  color: var(--gray-a6);
+  user-select: none;
+}
+
+/* Line highlighting */
+.code-block .line[data-highlighted="true"] {
+  background-color: var(--amber-a3);
+  display: block;
+  margin: 0 -1rem;
+  padding: 0 1rem;
+}
+
+/* Diff lines */
+.code-block .line[data-diff="+"] {
+  background-color: var(--green-a3);
+  display: block;
+  margin: 0 -1rem;
+  padding: 0 1rem;
+}
+
+.code-block .line[data-diff="-"] {
+  background-color: var(--red-a3);
+  display: block;
+  margin: 0 -1rem;
+  padding: 0 1rem;
+}
+
+.code-block .line[data-diff="+"]::before {
+  content: "+ ";
+  color: var(--green-11);
+  font-weight: bold;
+}
+
+.code-block .line[data-diff="-"]::before {
+  content: "- ";
+  color: var(--red-11);
+  font-weight: bold;
+}
+
+/* Focus lines */
+.code-block .line:not([data-focus="true"]) {
+  opacity: 0.5;
+  filter: grayscale(100%);
+  transition: opacity 0.2s, filter 0.2s;
+}
+
+.code-block:hover .line:not([data-focus="true"]) {
+  opacity: 0.8;
+  filter: grayscale(0%);
+}
+
+/* Copy button */
+.code-block-copy {
+  position: absolute;
+  top: 0.5rem;
+  right: 0.5rem;
+  padding: 0.25rem 0.5rem;
+  border-radius: 4px;
+  background: var(--gray-a3);
+  color: var(--gray-12);
+  border: 1px solid var(--gray-a5);
+  cursor: pointer;
+  font-size: 12px;
+  transition: all 0.2s;
+}
+
+.code-block-copy:hover {
+  background: var(--gray-a4);
+  border-color: var(--gray-a6);
+}
+
+.code-block-copy.copied {
+  background: var(--green-a3);
+  border-color: var(--green-a5);
+  color: var(--green-11);
+}
+
+/* Language badge */
+.code-block-lang {
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 0.25rem 0.75rem;
+  background: var(--gray-a3);
+  color: var(--gray-11);
+  font-size: 12px;
+  font-weight: 500;
+  border-bottom-left-radius: 4px;
+  user-select: none;
+}
+
+/* Scrollbar styling */
+.code-block pre::-webkit-scrollbar {
+  height: 8px;
+  width: 8px;
+}
+
+.code-block pre::-webkit-scrollbar-track {
+  background: var(--gray-a3);
+  border-radius: 4px;
+}
+
+.code-block pre::-webkit-scrollbar-thumb {
+  background: var(--gray-a6);
+  border-radius: 4px;
+}
+
+.code-block pre::-webkit-scrollbar-thumb:hover {
+  background: var(--gray-a7);
+}
+
+/* Inline code */
+code:not(.code-block code) {
+  padding: 0.2em 0.4em;
+  margin: 0;
+  font-size: 0.85em;
+  background-color: var(--gray-a3);
+  border-radius: 4px;
+  font-family: 'JetBrains Mono', 'Fira Code', 'SF Mono', Consolas, 'Liberation Mono', Menlo, monospace;
+}