Merge branch 'main' into add-ui

Author: davidsklar99

.github/workflows/build.yaml

@@ -15,6 +15,11 @@ concurrency:
 on:
   push:
     branches: [main]
+  pull_request:
+    branches: [main]
+
+env:
+  VITE_MAPBOX_API_TOKEN: ${{ secrets.VITE_MAPBOX_API_TOKEN }}
 
 jobs:
   test:
@@ -47,12 +52,14 @@ jobs:
           curl https://rclone.org/install.sh | sudo bash
 
       - name: Upload to S3
+        if: github.event_name == 'push'
         env:
           S3_BUCKET: ${{ vars.S3_BUCKET }}
           S3_PATH: ${{ vars.S3_PATH }}
           S3_ENDPOINT: ${{ vars.S3_ENDPOINT }}
           S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
           S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+          VITE_MAPBOX_API_TOKEN: ${{ secrets.VITE_MAPBOX_API_TOKEN }}
         run: |
           echo "Uploading to S3 bucket: $S3_BUCKET" 
           rclone sync ./storybook-static \

package.json

@@ -64,7 +64,9 @@
     "vite": "^5.4.11"
   },
   "resolutions": {
-    "@types/react": "18.3.12"
+    "@types/react": "18.3.12",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "workspaces": [
     "packages/*",

packages/column-components/src/notes/connector.ts

@@ -31,6 +31,7 @@ const NotePositioner = forwardRef(function (
       x: paddingLeft - outerPad,
       y,
       height: noteHeight + 2 * outerPad,
+      overflow: "visible",
       style: { overflowY: "visible" },
     },
     [

packages/column-components/src/notes/note.ts

@@ -68,6 +68,12 @@ export function NotesList(props: NoteListProps) {
   return h(
     "g",
     notesInfo.map(({ note, pixelOffset, pixelHeight, spacing }) => {
+      // If the note has a bad pixelOffset, skip it
+
+      if (pixelOffset == null || pixelHeight == null) {
+        return null;
+      }
+
       return h(Note, {
         key: note.id,
         note,

packages/column-creator/package.json

@@ -0,0 +1,53 @@
+{
+  "name": "@macrostrat/column-creator",
+  "version": "0.0.1",
+  "description": "Interface for defining stratigraphic columns in a standardized format",
+  "type": "module",
+  "source": "src/index.ts",
+  "main": "dist/esm/index.js",
+  "types": "dist/esm/index.d.ts",
+  "node": "dist/node/index.js",
+  "sideEffects": [
+    "**/*.css"
+  ],
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "import": "./dist/esm/index.js",
+      "types": "./dist/esm/index.d.ts",
+      "node": "./dist/node/index.js"
+    }
+  },
+  "targets": {
+    "node": {
+      "engines": {
+        "node": ">=14"
+      }
+    }
+  },
+  "scripts": {
+    "build": "rm -rf dist && parcel build"
+  },
+  "dependencies": {
+    "@macrostrat/column-components": "workspace:^",
+    "@macrostrat/column-views": "workspace:^",
+    "@macrostrat/hyper": "^3.0.6",
+    "zustand": "^5.0.3",
+    "zustand-computed": "^2.0.2"
+  },
+  "peerDependencies": {
+    "react": "^16.8.6||^17.0.0||^18.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/UW-Macrostrat/web-components.git",
+    "directory": "packages/column-creator"
+  },
+  "devDependencies": {
+    "parcel": "^2.14.4"
+  },
+  "files": [
+    "dist",
+    "src"
+  ]
+}

packages/column-creator/src/index.module.sass

@@ -0,0 +1,2 @@
+div.data-editor-content
+  width: 800px