@tideworthy/tidysites-platform 0.9.0 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.1
+
+- Editor: one editor on the site. An article page (a post, a service area, a page with the article layout) gets the bar too, with Publish from the entry's draft state, Business details and Done, over EmDash's inline prose editing; EmDash's own pill is hidden under the bar everywhere. Inside sections and record regions this editor owns the fields and EmDash's inline editor does not mount; outside them (article prose) it keeps working.
+
 ## 0.9.0
 
 - Editor: sections are an EmDash `blocks` field (`sections` by default), and the forms come from the seed's block type definitions (`slug`, `type`, `validation.options`, `subFields`) instead of Block Kit shapes. Fields render by EmDash type: string, text, url, number, integer, boolean, datetime, select, multiSelect, image (the media picker, storing EmDash's media value) and repeater; Portable Text and file fields say "edit in the admin". New blocks carry no `_version` so EmDash stamps the active one; a saved block keeps its `_type`, `_key` and `_version`, and fields the form read as empty are left out rather than written as null.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tideworthy/tidysites-platform",
-	"version": "0.9.0",
+	"version": "0.9.1",
 	"description": "The Tidysites platform integration for EmDash sites: bootstrap, sessions, maintenance, health, and publish hooks under /_tidy/*.",
 	"license": "MIT",
 	"type": "module",

package/src/editor/TidyEditor.astro

@@ -9,10 +9,10 @@
  * block with `data-tidy-block` (its key) and `data-tidy-type`, and wraps the
  * list in `data-tidy-blocks`. A record region (`data-tidy-record`,
  * `data-tidy-record-id`, `data-tidy-record-label`) gets an "Edit details"
- * chip whose form comes from EmDash's manifest. A page without blocks (an
- * article) gets the bar only; EmDash's inline editing handles its prose and
- * its toolbar shows there. While editing is off, EmDash's toolbar is hidden:
- * the bar is the one control. The bar sets `--tidy-bar` on <html> (its
+ * chip whose form comes from EmDash's manifest. A page without sections (an
+ * article) gets the bar too: Publish, Business details and Done over EmDash's
+ * inline prose editing, whose own pill is always hidden under the bar, so the
+ * site has one editor. The bar sets `--tidy-bar` on <html> (its
  * height) so a template's sticky header can sit below it.
  */
 import type { Block, BlockTypeSchema } from "./ops";
@@ -35,9 +35,12 @@ const signedIn = Boolean(Astro.session ? await Astro.session.get("user") : null)
 const active = Astro.cookies.get("emdash-edit-mode")?.value === "true";
 const here = Astro.url.pathname + Astro.url.search;
 const toggle = (on: boolean) => `/_tidy/edit?on=${on ? 1 : 0}&to=${encodeURIComponent(here)}`;
-const editable = active && Boolean(collection && id && blocks && value);
-const config = editable ? JSON.stringify({ collection, id, field, blocks, value, records, done: toggle(false) }) : null;
-const htmlClass = !signedIn ? "" : !active ? "tidy-has-bar tidy-idle" : editable ? "tidy-has-bar" : "tidy-has-bar tidy-inline";
+// Any entry page is editable: a sections page gets the frames and the picker,
+// an article page gets the bar (Publish, Business details, Done) over EmDash's
+// inline prose editing. One editor on the site, never two.
+const editable = active && Boolean(collection && id);
+const config = editable ? JSON.stringify({ collection, id, field, blocks: blocks ?? [], value: value ?? [], records, done: toggle(false) }) : null;
+const htmlClass = !signedIn ? "" : !active ? "tidy-has-bar tidy-idle" : "tidy-has-bar";
 ---
 {signedIn && (
 	<>
@@ -58,7 +61,8 @@ const htmlClass = !signedIn ? "" : !active ? "tidy-has-bar tidy-idle" : editable
 	</>
 )}
 <style is:global>
-	.tidy-editing #emdash-toolbar, .tidy-idle #emdash-toolbar { display: none !important; }
+	/* EmDash's own pill never shows under the bar; its inline prose editing keeps working underneath. */
+	html.tidy-has-bar #emdash-toolbar { display: none !important; }
 	html.tidy-has-bar { --tidy-bar: 44px; }
 	html.tidy-has-bar body { padding-top: var(--tidy-bar); }
 	.tidy-bar { position: fixed; top: 0; left: 0; right: 0; height: var(--tidy-bar, 44px); z-index: 2147483000; display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 0 16px; box-sizing: border-box; background: #17211c; color: #fff; font: 500 13px/1 system-ui, sans-serif; box-shadow: 0 1px 0 rgba(255,255,255,.08), 0 6px 20px rgba(0,0,0,.18); }

package/src/editor/runtime.ts

@@ -99,9 +99,11 @@ export function start(config: Config): void {
 	const schemaOf = (type: string) => config.blocks.find((b) => b.slug === type);
 	const frames = () => Array.from(document.querySelectorAll<HTMLElement>("[data-tidy-block]"));
 
-	// EmDash's inline editor is for prose pages; here the sections and records own their fields.
+	// Inside the sections and the record regions this editor owns the fields, so
+	// EmDash's inline editor must not mount there; article prose outside them
+	// keeps EmDash's in-place editing under this bar.
 	document.documentElement.classList.add("tidy-editing");
-	document.querySelectorAll("[data-emdash-ref]").forEach((n) => n.removeAttribute("data-emdash-ref"));
+	document.querySelectorAll("[data-tidy-blocks] [data-emdash-ref], [data-tidy-record] [data-emdash-ref]").forEach((n) => n.removeAttribute("data-emdash-ref"));
 
 	// --- pending publishes ---------------------------------------------------
 	// Records whose publish failed after a save; the page itself is read from EmDash.

package/src/version.ts

@@ -1,3 +1,3 @@
 /** Kept in step with package.json by the release checklist in MAINTAINING.md. */
-export const VERSION = "0.9.0";
+export const VERSION = "0.9.1";
 export const PLUGIN_ID = "tidy-platform";