@riebeckite/plugin-share 0.0.15 → 0.0.17

package/README.md

@@ -122,7 +122,6 @@ optional `className` is added to the root without replacing them.
 - `buildShareUrl(service, target, instance?)` — build one service URL
 - `buildShareLinks(options, target)` — build every link-bearing service
 - `renderShareControls(options, target)` — render the controls HTML
-- `injectShareControls(html, block, placement)` — insert into a note fragment
 - `initShare()` — client initializer (also via
   `@riebeckite/plugin-share/client`)
 - Constants: `SHARE_SERVICES`, `SHARE_ATTRIBUTE`, `SHARE_ROOT_CLASS`,
@@ -134,10 +133,9 @@ optional `className` is added to the root without replacing them.
 
 - Share URLs are fixed at build time. A full rebuild always recomputes them.
 - Mastodon cannot be enabled without a concrete instance.
-- The plugin inserts into the note fragment; a Site that owns its layout can
-  move the controls with CSS or omit them per page.
+- The plugin contributes controls to `article.before-content` for `top` and
+  `article.footer` for `bottom`; a Site places those semantic slots in its layout.
 
 ## See also
 
 - [Plugin guide](../../../docs/en/docs/reference/plugin-api.md)
-

package/README_ja.md

@@ -122,7 +122,6 @@ import "@riebeckite/plugin-share/style.css";
 - `buildShareUrl(service, target, instance?)` — 1 サービスの URL を組み立てる
 - `buildShareLinks(options, target)` — リンクを持つサービスをすべて組み立てる
 - `renderShareControls(options, target)` — コントロールの HTML を生成する
-- `injectShareControls(html, block, placement)` — ノート断片に挿入する
 - `initShare()` — ブラウザ初期化関数（`@riebeckite/plugin-share/client` からも
   読み込める）
 - 定数: `SHARE_SERVICES`, `SHARE_ATTRIBUTE`, `SHARE_ROOT_CLASS`,
@@ -134,10 +133,9 @@ import "@riebeckite/plugin-share/style.css";
 
 - 共有 URL はビルド時に確定します。再ビルドすれば常に正しく再計算されます。
 - Mastodon は具体的なインスタンスなしには有効化できません。
-- プラグインはノート断片に挿入します。レイアウトを所有する Site は、CSS で
-  位置を変えたり、ページごとに出力しない選択もできます。
+- `top` は `article.before-content`、`bottom` は `article.footer` にコントロールを
+  提供します。Site は layout でその semantic slot を配置します。
 
 ## 関連
 
 - [プラグインガイド](../../../docs/ja/docs/reference/plugin-api.md)
-

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { ShareOptions } from "./src/types.js";
 export { initShare } from "./src/client.js";
 export { DEFAULT_SHARE_ARIA_LABEL, DEFAULT_SHARE_COPIED_LABEL, DEFAULT_SHARE_COPY_FAILED_LABEL, DEFAULT_SHARE_LABELS, DEFAULT_SHARE_PLACEMENT, DEFAULT_SHARE_SERVICES, resolveShareOptions, validateShareOptions, } from "./src/options.js";
-export { injectShareControls, renderShareControls, SHARE_ATTRIBUTE, SHARE_ROOT_CLASS, } from "./src/render.js";
+export { renderShareControls, SHARE_ATTRIBUTE, SHARE_ROOT_CLASS, } from "./src/render.js";
 export { buildAbsoluteUrl, buildShareLinks, buildShareUrl, normalizeMastodonInstance, type ShareTarget, } from "./src/services.js";
 export type { ResolvedShareOptions, ShareLink, ShareOptions, SharePlacement, ShareService, } from "./src/types.js";
 export { SHARE_SERVICES } from "./src/types.js";
@@ -10,8 +10,8 @@ export declare const SHARE_PLUGIN_NAME = "share";
  * Per-article share controls.
  *
  * For every entry the plugin builds absolute share URLs for the configured
- * services and injects the controls into the manifest entry HTML, which is the
- * final rendering source. The links are ordinary anchors, so they work without
+ * services and contributes the controls to an article layout slot. The links
+ * are ordinary anchors, so they work without
  * JavaScript; only the copy-link action is enhanced at runtime.
  */
 export declare function share(options?: ShareOptions): import("@riebeckite/core").RiebeckitePlugin<ShareOptions>;

package/dist/index.js

@@ -1,5 +1,6 @@
 // index.ts
 import {
+  appendContentBodySlot,
   createClientEntry,
   createStyleAsset,
   definePlugin
@@ -228,29 +229,6 @@ function renderShareControls(options, target) {
   const ariaLabel = escapeHtmlAttribute(options.ariaLabel);
   return `<div class="${escapeHtmlAttribute(rootClass)}" ${SHARE_ATTRIBUTE} data-rr-share-placement="${escapeHtmlAttribute(options.placement)}" role="group" aria-label="${ariaLabel}"><ul class="${SHARE_ROOT_CLASS}__list">${items}${copyItem}</ul><p class="${SHARE_ROOT_CLASS}__status" role="status" aria-live="polite"></p></div>`;
 }
-function injectShareControls(html, block, placement) {
-  if (block === "" || html.includes(SHARE_ATTRIBUTE)) return html;
-  if (placement === "top") {
-    const article = /<article\b[^>]*>/i.exec(html);
-    if (article) {
-      const end = article.index + article[0].length;
-      return `${html.slice(0, end)}${block}${html.slice(end)}`;
-    }
-    const body = /<body\b[^>]*>/i.exec(html);
-    if (body) {
-      const end = body.index + body[0].length;
-      return `${html.slice(0, end)}${block}${html.slice(end)}`;
-    }
-    return `${block}
-${html}`;
-  }
-  const closeIndex = html.toLowerCase().lastIndexOf("</article>");
-  if (closeIndex !== -1) {
-    return `${html.slice(0, closeIndex)}${block}${html.slice(closeIndex)}`;
-  }
-  return `${html}
-${block}`;
-}
 function renderLinkItem(link) {
   const modifier = `${SHARE_ROOT_CLASS}__link--${link.service}`;
   return `<li class="${SHARE_ROOT_CLASS}__item"><a class="${SHARE_ROOT_CLASS}__link ${modifier}" href="${escapeHtmlAttribute(link.url)}" target="_blank" rel="noopener noreferrer" data-share-service="${escapeHtmlAttribute(link.service)}">${escapeHtml(link.label)}</a></li>`;
@@ -339,14 +317,15 @@ function share(options = {}) {
       const { manifest, config } = context;
       if (!config) return;
       for (const entry of manifest.entries) {
-        if (!entry.html || entry.html.includes(SHARE_ATTRIBUTE)) continue;
         const block = renderShareControls(resolved, {
           url: buildAbsoluteUrl(config, entry.permalink),
           title: entry.title
         });
         if (block === "") continue;
-        const html = injectShareControls(entry.html, block, resolved.placement);
-        entry.html = html;
+        const slot = resolved.placement === "top" ? "article.before-content" : "article.footer";
+        if (!hasSlotFragment(entry.bodySlots?.[slot], block)) {
+          appendContentBodySlot(entry, slot, block);
+        }
       }
     },
     assets: [createStyleAsset(SHARE_PLUGIN_NAME)],
@@ -354,6 +333,13 @@ function share(options = {}) {
   });
 }
 var sharePlugin = share;
+function hasSlotFragment(slot, fragment) {
+  return slot === fragment || slot?.startsWith(`${fragment}
+`) || slot?.endsWith(`
+${fragment}`) || slot?.includes(`
+${fragment}
+`) || false;
+}
 export {
   DEFAULT_SHARE_ARIA_LABEL,
   DEFAULT_SHARE_COPIED_LABEL,
@@ -369,7 +355,6 @@ export {
   buildShareLinks,
   buildShareUrl,
   initShare,
-  injectShareControls,
   normalizeMastodonInstance,
   renderShareControls,
   resolveShareOptions,

package/dist/src/render.d.ts

@@ -1,5 +1,5 @@
 import { type ShareTarget } from "./services.js";
-import type { ResolvedShareOptions, SharePlacement } from "./types.js";
+import type { ResolvedShareOptions } from "./types.js";
 /** Attribute that marks the generated controls for tests, CSS, and JS. */
 export declare const SHARE_ATTRIBUTE = "data-rr-share";
 /** Stable root hook every rendered set carries, even with a custom class. */
@@ -9,9 +9,3 @@ export declare const SHARE_ROOT_CLASS = "rr-share";
  * service can be rendered, so callers can leave the HTML untouched.
  */
 export declare function renderShareControls(options: ResolvedShareOptions, target: ShareTarget): string;
-/**
- * Inserts the rendered controls into a note fragment. Top placement lands
- * after the opening `<article>` (or at the start) and bottom placement lands
- * before the closing `</article>` (or at the end).
- */
-export declare function injectShareControls(html: string, block: string, placement: SharePlacement): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riebeckite/plugin-share",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -21,7 +21,7 @@
     "./style.css": "./style.css"
   },
   "dependencies": {
-    "@riebeckite/core": "0.0.15"
+    "@riebeckite/core": "0.0.17"
   },
   "devDependencies": {
     "tsx": "^4.22.4"

package/style.css

@@ -72,8 +72,3 @@
 .rr-share__status:empty {
   display: none;
 }
-
-html[data-theme="dark"] .rr-share,
-html.dark .rr-share {
-  --rr-share-ink: var(--rb-color-paper, #ffffff);
-}