move tldraw/next inside of logseq

package.json

@@ -61,7 +61,8 @@
         "cljs:debug": "clojure -M:cljs release app --debug",
         "cljs:report": "clojure -M:cljs run shadow.cljs.build-report app report.html",
         "cljs:build-electron": "clojure -A:cljs compile app electron",
-        "cljs:lint": "clojure -M:clj-kondo --parallel --lint src"
+        "cljs:lint": "clojure -M:clj-kondo --parallel --lint src",
+        "tldraw:build": "cd tldraw && yarn build"
     },
     "dependencies": {
         "@capacitor/android": "3.2.2",

shadow-cljs.edn

@@ -6,7 +6,7 @@
  :dev-http {3001 ["static" "."]
             3002 ["public/workspaces" "."]}
  
- :js-options {:js-package-dirs ["node_modules" "tldraw"]}
+ :js-options {:js-package-dirs ["node_modules" "tldraw/apps"]}
 
  :builds
  {:app {:target        :browser

src/main/frontend/components/sidebar.cljs

@@ -478,7 +478,7 @@
         wide-mode? (state/sub :ui/wide-mode?)
         right-sidebar-blocks (state/sub-right-sidebar-blocks)
         route-name (get-in route-match [:data :name])
-        margin-less-pages? (#{:graph :whiteboard} route-name)
+        margin-less-pages? (boolean (#{:graph :whiteboard} route-name))
         db-restoring? (state/sub :db/restoring?)
         indexeddb-support? (state/sub :indexeddb/support?)
         page? (= :page route-name)

src/main/frontend/extensions/tldraw.cljs

@@ -37,7 +37,7 @@
        {:style {:overscroll-behavior "none"}}
        [:div.draw-wrap.relative
         {:on-blur #(state/set-block-component-editing-mode! false)
-         :style {:height "calc(100vh - 120px)" }}
+         :style {:height "calc(100vh - 80px)" }}
 
         (tldraw {:PageComponent page
                  :searchHandler (comp clj->js vec search/page-search)

tldraw/.eslintignore

@@ -0,0 +1,3 @@
+**/node_modules/*
+**/out/*
+**/.next/*

tldraw/.eslintrc

@@ -0,0 +1,16 @@
+{
+  "root": true,
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
+  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
+  "ignorePatterns": ["*.js"],
+  "overrides": [
+    {
+      // enable the rule specifically for TypeScript files
+      "files": ["*.ts", "*.tsx"],
+      "rules": {
+        "@typescript-eslint/explicit-module-boundary-types": [0]
+      }
+    }
+  ]
+}

tldraw/.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

tldraw/.gitignore

@@ -0,0 +1,17 @@
+node_modules/
+build/
+dist/
+docs/
+.idea/*
+
+.DS_Store
+coverage
+*.log
+
+.vercel
+.next
+apps/www/public/workbox-*
+apps/www/public/worker-*
+apps/www/public/sw.js
+apps/www/public/sw.js.map
+.env

tldraw/.npmignore

@@ -0,0 +1,17 @@
+/.github/
+/.vscode/
+/node_modules/
+/build/
+/tmp/
+.idea/*
+/docs/
+
+coverage
+*.log
+.gitlab-ci.yml
+
+package-lock.json
+/*.tgz
+/tmp*
+/mnt/
+/package/

tldraw/.prettierrc

@@ -0,0 +1,11 @@
+{
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "semi": false,
+  "printWidth": 100,
+  "tabWidth": 2,
+  "useTabs": false,
+  "jsxSingleQuote": false,
+  "jsxBracketSameLine": false,
+  "arrowParens": "avoid"
+}

tldraw/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Stephen Ruiz Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

tldraw/tldraw-logseq/package.json → tldraw/apps/tldraw-logseq/package.json

@@ -6,6 +6,7 @@
   "module": "dist/index.mjs",
   "scripts": {
     "build": "zx build.mjs",
+    "build:packages": "yarn build",
     "dev": "tsup --watch",
     "dev:vite": "tsup --watch --sourcemap inline"
   },
@@ -17,11 +18,13 @@
     "@types/node": "^14.14.35",
     "@types/react": "^16.9.55",
     "@types/react-dom": "^16.9.9",
+    "autoprefixer": "^10.4.7",
     "concurrently": "^7.0.0",
     "esbuild": "^0.13.8",
     "mobx": "^6.3.7",
     "mobx-react-lite": "^3.2.2",
     "perfect-freehand": "^1.0.16",
+    "postcss": "^8.4.13",
     "react": ">=16.8",
     "react-dom": "^16.8 || ^17.0",
     "react-select": "^5.3.2",

tldraw/apps/tldraw-logseq/postcss.config.js

@@ -0,0 +1,3 @@
+module.exports = ctx => ({
+  plugins: [require('autoprefixer')()],
+})

tldraw/tldraw-logseq/src/components/PrimaryTools/PrimaryTools.tsx → tldraw/apps/tldraw-logseq/src/components/PrimaryTools/PrimaryTools.tsx

@@ -14,7 +14,7 @@ import {
 } from '@radix-ui/react-icons'
 import { observer } from 'mobx-react-lite'
 import { Button } from '~components/Button'
-import { EraserIcon, LineIcon } from '~components/icons'
+import { EraserIcon, LineIcon, LogseqIcon } from '~components/icons'
 
 export const PrimaryTools = observer(function PrimaryTools() {
   const app = useApp()
@@ -40,7 +40,6 @@ export const PrimaryTools = observer(function PrimaryTools() {
 
   return (
     <div className="primary-tools">
-      <button className="floating-button"></button>
       <div className="panel floating-panel" data-tool-locked={app.settings.isToolLocked}>
         <Button
           data-tool="select"
@@ -136,10 +135,9 @@ export const PrimaryTools = observer(function PrimaryTools() {
           onClick={handleToolClick}
           onDoubleClick={handleToolDoubleClick}
         >
-          🥹
+          <LogseqIcon />
         </Button>
       </div>
-      <button className="floating-button"></button>
     </div>
   )
 })

tldraw/apps/tldraw-logseq/src/components/icons/LogseqIcon.tsx

@@ -0,0 +1,14 @@
+import * as React from 'react'
+
+// @ts-expect-error don't bother fix it ...
+import iconBase64 from './logseq-icon.png'
+
+export function LogseqIcon() {
+  return (
+    <img
+      style={{ borderRadius: '50%', width: '20px', height: '20px' }}
+      src={'data:image/png;base64,' + iconBase64}
+      alt="logseq"
+    />
+  )
+}

tldraw/tldraw-logseq/src/components/icons/index.ts → tldraw/apps/tldraw-logseq/src/components/icons/index.ts

@@ -15,3 +15,4 @@ export * from './EraserIcon'
 export * from './MultiplayerIcon'
 export * from './DiscordIcon'
 export * from './LineIcon'
+export * from './LogseqIcon'

tldraw/tldraw-logseq/src/lib/shapes/LogseqPortalShape.tsx → tldraw/apps/tldraw-logseq/src/lib/shapes/LogseqPortalShape.tsx

@@ -75,6 +75,11 @@ export class LogseqPortalShape extends TLBoxShape<LogseqPortalShapeProps> {
           type="text"
           value={q}
           onChange={handleChange}
+          onKeyDown={e => {
+            if (e.key === 'Enter') {
+              commitChange(q)
+            }
+          }}
           list="logseq-portal-search-results"
         />
         <datalist id="logseq-portal-search-results">

tldraw/tldraw-logseq/tsup.config.ts → tldraw/apps/tldraw-logseq/tsup.config.ts

@@ -5,6 +5,8 @@ export default defineConfig({
   platform: 'browser',
   format: ['cjs', 'esm'],
   entry: ['src/index.ts'],
-  clean: true
+  clean: true,
+  loader: {
+    '.png': 'base64',
+  },
 })
- 

tldraw/assets/sentry.svg

@@ -0,0 +1 @@
+<svg class="__sntry__ css-15xgryy e10nushx5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 44" width="212" height="47" style=""><defs><style type="text/css">@media (prefers-color-scheme: dark) {path.__sntry__ { fill: #362d59 !important; }}</style></defs><path d="M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z M124.32,28.28,109.56,9.22h-3.68V34.77h3.73V15.19l15.18,19.58h3.26V9.22h-3.73ZM87.15,23.54h13.23V20.22H87.14V12.53h14.93V9.21H83.34V34.77h18.92V31.45H87.14ZM71.59,20.3h0C66.44,19.06,65,18.08,65,15.7c0-2.14,1.89-3.59,4.71-3.59a12.06,12.06,0,0,1,7.07,2.55l2-2.83a14.1,14.1,0,0,0-9-3c-5.06,0-8.59,3-8.59,7.27,0,4.6,3,6.19,8.46,7.52C74.51,24.74,76,25.78,76,28.11s-2,3.77-5.09,3.77a12.34,12.34,0,0,1-8.3-3.26l-2.25,2.69a15.94,15.94,0,0,0,10.42,3.85c5.48,0,9-2.95,9-7.51C79.75,23.79,77.47,21.72,71.59,20.3ZM195.7,9.22l-7.69,12-7.64-12h-4.46L186,24.67V34.78h3.84V24.55L200,9.22Zm-64.63,3.46h8.37v22.1h3.84V12.68h8.37V9.22H131.08ZM169.41,24.8c3.86-1.07,6-3.77,6-7.63,0-4.91-3.59-8-9.38-8H154.67V34.76h3.8V25.58h6.45l6.48,9.2h4.44l-7-9.82Zm-10.95-2.5V12.6h7.17c3.74,0,5.88,1.77,5.88,4.84s-2.29,4.86-5.84,4.86Z" fill="#ffffff" class="__sntry__"></path></svg>