Merge branch 'main' into disable-yjs-connecting-status-in-tests-cyber…

…semics#2111

package.json

@@ -1,6 +1,6 @@
 {
   "name": "em",
-  "version": "300.30.16",
+  "version": "300.30.17",
   "author": "Raine Revere <[email protected]>",
   "description": "A beautiful, minimalistic note-taking app for personal sensemaking.",
   "license": "NoHarm-draft",
@@ -104,7 +104,7 @@
     "moize": "^6.1.6",
     "murmurhash3js": "^3.0.1",
     "nanoid": "^5.0.7",
-    "openai": "^4.56.0",
+    "openai": "^4.67.1",
     "page-lifecycle": "git+https://github.com/magic-akari/page-lifecycle#feat/add-types",
     "pluralize": "^8.0.0",
     "qrcode.react": "^3.1.0",

panda.config.ts

@@ -1,14 +1,20 @@
 // https://panda-css.com/docs/references/config
 import { defineConfig, defineGlobalStyles, defineKeyframes } from '@pandacss/dev'
 import anchorButtonRecipe from './src/recipes/anchorButton'
+import bulletRecipe from './src/recipes/bullet'
 import buttonRecipe from './src/recipes/button'
+import childRecipe from './src/recipes/child'
+import dropEndRecipe from './src/recipes/dropEnd'
+import dropHoverRecipe from './src/recipes/dropHover'
 import editableRecipe from './src/recipes/editable'
 import extendTapRecipe from './src/recipes/extendTap'
 import iconRecipe from './src/recipes/icon'
+import invalidOptionRecipe from './src/recipes/invalidOption'
 import linkRecipe from './src/recipes/link'
 import modalRecipe from './src/recipes/modal'
 import modalTextRecipe from './src/recipes/modalText'
 import multilineRecipe from './src/recipes/multiline'
+import textNoteRecipe from './src/recipes/textNote'
 import thoughtRecipe from './src/recipes/thought'
 import tutorialBulletRecipe from './src/recipes/tutorialBullet'
 import upperRightRecipe from './src/recipes/upperRight'
@@ -84,13 +90,11 @@ const globalCss = defineGlobalStyles({
     '--z-index-gesture-trace': '50',
     '--z-index-command-palette': '45',
     '--z-index-modal': '40',
-    '--z-index-toolbar-container': '20',
     '--z-index-toolbar-overlay': '15',
     '--z-index-toolbar-arrow': '15',
     '--z-index-toolbar': '10',
     '--z-index-navbar': '10',
     '--z-index-latest-shortcuts': '10',
-    '--z-index-drop-empty': '6',
     '--z-index-subthoughts-drop-end': '5',
     '--z-index-tutorial': '3',
     '--z-index-scroll-zone': '2',
@@ -275,15 +279,21 @@ export default defineConfig({
       },
       recipes: {
         icon: iconRecipe,
+        child: childRecipe,
         anchorButton: anchorButtonRecipe,
         button: buttonRecipe,
+        bullet: bulletRecipe,
         link: linkRecipe,
         extendTap: extendTapRecipe,
         thought: thoughtRecipe,
         editable: editableRecipe,
+        textNote: textNoteRecipe,
         multiline: multilineRecipe,
         tutorialBullet: tutorialBulletRecipe,
         upperRight: upperRightRecipe,
+        dropHover: dropHoverRecipe,
+        dropEnd: dropEndRecipe,
+        invalidOption: invalidOptionRecipe,
       },
       slotRecipes: {
         modal: modalRecipe,
@@ -304,6 +314,9 @@ export default defineConfig({
               _dark: 'rgba(255, 255, 255, 0.5)',
             },
           },
+          invalidOption: {
+            value: 'tomato !important',
+          },
         },
         durations: {
           highlightPulseDuration: {

src/@types/CommandState.ts

@@ -1,6 +1,6 @@
 import FormattingCommand from './FormattingCommand'
 
 /** The set of commands applied to text (bold, italic, underline, strikethrough). */
-type CommandState = Record<FormattingCommand, boolean>
+type CommandState = Record<FormattingCommand, boolean | string | undefined>
 
 export default CommandState

src/@types/FormattingCommand.ts

@@ -3,6 +3,8 @@ enum FormattingCommand {
   italic = 'italic',
   underline = 'underline',
   strikethrough = 'strikethrough',
+  foreColor = 'foreColor',
+  backColor = 'backColor',
 }
 
 export default FormattingCommand

src/@types/Icon.ts

@@ -1,7 +1,8 @@
 import React from 'react'
+import { SystemStyleObject } from '../../styled-system/types'
 
 interface Icon {
-  className?: string
+  cssRaw?: SystemStyleObject
   fill?: string
   height?: number
   size?: number