@maple-kit/ui 0.10.0 → 0.11.0

package/dist/island/language.js

@@ -1,3 +1,4 @@
+import { COMMENT_SHORTCUT } from "@maple-kit/core/client";
 //#region src/island/language.ts
 const FILTER_LABELS = {
 	all: "All",
@@ -23,11 +24,6 @@ function tallyTitle(filter, count) {
 	const many = count === 1 ? "comment" : "comments";
 	return `${String(count)} ${FILTER_LABELS[filter].toLowerCase()} ${many} — click to show only these`;
 }
-const PICK_ORDER = [
-	"element",
-	"text",
-	"region"
-];
 const PICK_LABELS = {
 	element: "Element",
 	region: "Region",
@@ -135,8 +131,8 @@ function openLabel(count) {
 function triggerLabel(count) {
 	return `Open Maple: ${openLabel(count)}`;
 }
-function pickTitle(kind) {
-	return `Comment on ${kind} — press t while picking to cycle`;
+function pickTitle(kind, key = COMMENT_SHORTCUT) {
+	return `Comment on ${kind} — press ${key} again while picking to cycle`;
 }
 function kindPhrase(kind, human) {
 	if (human === void 0) return "somewhere on this page";
@@ -144,4 +140,4 @@ function kindPhrase(kind, human) {
 	return kind === "region" ? `an area of ${human}` : human;
 }
 //#endregion
-export { ACCOUNT_COPY, APPROVE_COPY, CORNER_LABELS, CORNER_ORDER, FILTERS_LABEL, FILTER_LABELS, FILTER_ORDER, ISLAND_COPY, PICK_LABELS, PICK_ORDER, SETTINGS_COPY, TALLY_ORDER, THEME_LABELS, THEME_TITLES, UNSENT_COPY, kindPhrase, openLabel, pickTitle, tallyTitle, triggerLabel };
+export { ACCOUNT_COPY, APPROVE_COPY, CORNER_LABELS, CORNER_ORDER, FILTERS_LABEL, FILTER_LABELS, FILTER_ORDER, ISLAND_COPY, PICK_LABELS, SETTINGS_COPY, TALLY_ORDER, THEME_LABELS, THEME_TITLES, UNSENT_COPY, kindPhrase, openLabel, pickTitle, tallyTitle, triggerLabel };

package/dist/maple.js

@@ -7,7 +7,6 @@ import { MapleComposer } from "./composer/composer.js";
 import { MapleDetail } from "./composer/detail.js";
 import { MapleScoreCard } from "./composer/score.js";
 import { MapleTarget } from "./composer/target.js";
-import { PICK_ORDER } from "./island/language.js";
 import { Approve } from "./island/approve.js";
 import { IslandContent } from "./island/content.js";
 import { Filters } from "./island/filters.js";
@@ -24,6 +23,7 @@ import { MapleMock } from "./mock/mock.js";
 import { MapleNotice } from "./notice/notice.js";
 import { MaplePicker } from "./picker/picker.js";
 import { createElement, forwardRef } from "react";
+import { PICK_ORDER } from "@maple-kit/core/client";
 //#region src/maple.ts
 const LOAD_CALLS = [
 	"load",

package/dist/marks/css.js

@@ -232,9 +232,8 @@ function ringCss() {
   will-change: transform;
 }
 
-.mk-ring[data-mk-state="hovered"] {
-  box-shadow: 0 0 0 1.5px color-mix(in oklab, var(--mk-accent) 60%, transparent);
-}
+/* No quieter hovered ring: pointing at a mark or tabbing onto it is asking
+   "which one", and a hairline answered it too faintly to be seen. */
 
 /* A passage is its own lines and nothing else: the box around them is the
    paragraph, and outlining that says the comment is on the paragraph. */

package/dist/picker/language.d.ts

@@ -7,7 +7,7 @@ export declare const PICKER_COPY: {
   readonly cancel: "Cancel";
   readonly cancelHint: "Esc";
   readonly bar: "Choosing what to comment on";
-  readonly cycle: "Press t to cycle";
+  readonly cycle: "Press c again to cycle";
 };
 /** What a screen reader hears on the bar while a pick is armed. */
 export declare function pickerLabel(kind: PickKind): string;

package/dist/picker/language.js

@@ -8,7 +8,7 @@ const PICKER_COPY = {
 	cancel: "Cancel",
 	cancelHint: "Esc",
 	bar: "Choosing what to comment on",
-	cycle: "Press t to cycle"
+	cycle: "Press c again to cycle"
 };
 function pickerLabel(kind) {
 	return `${PICKER_COPY.bar}: ${PICK_HINTS[kind]}.`;

package/dist/picker/picker.js

@@ -1,12 +1,12 @@
 import { useMapleUi } from "../context.js";
 import { useShots } from "../shots.js";
-import { PICK_ORDER } from "../island/language.js";
 import { ringLabel } from "../marks/label.js";
 import { MapleTargetRing } from "../marks/ring.js";
 import { PICKER_COPY, PICK_HINTS, pickerLabel } from "./language.js";
 import { startSession } from "./session.js";
 import { elementOf, targetFor } from "./target.js";
-import { Fragment, createElement, useCallback, useEffect, useRef, useState } from "react";
+import { Fragment, createElement, useCallback, useEffect, useState } from "react";
+import { PICK_ORDER } from "@maple-kit/core/client";
 import { captureContext, watchPickKeys } from "@maple-kit/core/overlay";
 import { useMaple, useMapleClient } from "@maple-kit/react";
 import { captureElement } from "@maple-kit/core/screenshot";
@@ -41,7 +41,7 @@ function MaplePicker(props) {
 		pick.armed,
 		root
 	]);
-	useKeys(pick.armed, kind, client);
+	useKeys(pick.armed, client);
 	if (!pick.armed || !kind) return null;
 	return createElement(Fragment, null, kind === "text" ? null : createElement("div", { className: shieldClass(props, kind) }), band ? createElement("div", {
 		className: "mk-band",
@@ -78,16 +78,13 @@ function capture(element, shots) {
 function reasonOf(error) {
 	return error instanceof Error ? error.message : String(error);
 }
-function useKeys(armed, kind, client) {
-	const latest = useRef(kind);
-	latest.current = kind;
+function useKeys(armed, client) {
 	useEffect(() => {
 		if (!armed) return;
 		const stop = new AbortController();
 		watchPickKeys({
 			signal: stop.signal,
-			onCancel: () => client.disarm(),
-			onCycle: () => client.arm(next(latest.current))
+			onCancel: () => client.disarm()
 		});
 		return () => stop.abort();
 	}, [armed, client]);
@@ -97,10 +94,6 @@ function onOwnControl(event, root) {
 	if (!(target instanceof Element) || target.getRootNode() !== root) return false;
 	return !target.classList.contains("mk-shield");
 }
-function next(kind) {
-	const at = kind === void 0 ? -1 : PICK_ORDER.indexOf(kind);
-	return PICK_ORDER[(at + 1) % PICK_ORDER.length] ?? "element";
-}
 function Hint(props) {
 	const client = useMapleClient();
 	return createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maple-kit/ui",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Maple's composed reviewer parts: the marks, the island and the composer",
   "license": "Apache-2.0",
   "type": "module",
@@ -33,9 +33,9 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@maple-kit/core": "0.10.0",
-    "@maple-kit/mock": "0.10.0",
-    "@maple-kit/react": "0.10.0"
+    "@maple-kit/core": "0.11.0",
+    "@maple-kit/react": "0.11.0",
+    "@maple-kit/mock": "0.11.0"
   },
   "peerDependencies": {
     "react": "^18.2.0 || ^19.0.0",