@pretty-chitty/core 2.1.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/DemoWrapper.d.ts +4 -1
- package/dist/components/DemoWrapper.d.ts.map +1 -1
- package/dist/components/DemoWrapper.js +2 -4
- package/dist/components/DemoWrapper.js.map +1 -1
- package/dist/components/Gallery/BuiltItem.d.ts +10 -0
- package/dist/components/Gallery/BuiltItem.d.ts.map +1 -1
- package/dist/components/Gallery/BuiltItem.js +65 -8
- package/dist/components/Gallery/BuiltItem.js.map +1 -1
- package/dist/components/Gallery/GalleryController.d.ts +8 -0
- package/dist/components/Gallery/GalleryController.d.ts.map +1 -1
- package/dist/components/Gallery/GalleryController.js +39 -6
- package/dist/components/Gallery/GalleryController.js.map +1 -1
- package/dist/components/Gallery/GalleryViewer.d.ts.map +1 -1
- package/dist/components/Gallery/GalleryViewer.js +91 -2
- package/dist/components/Gallery/GalleryViewer.js.map +1 -1
- package/dist/components/Gallery/LayoutManager.d.ts +4 -0
- package/dist/components/Gallery/LayoutManager.d.ts.map +1 -1
- package/dist/components/Gallery/LayoutManager.js +36 -10
- package/dist/components/Gallery/LayoutManager.js.map +1 -1
- package/dist/components/Gallery/constants.d.ts +5 -1
- package/dist/components/Gallery/constants.d.ts.map +1 -1
- package/dist/components/Gallery/constants.js +5 -1
- package/dist/components/Gallery/constants.js.map +1 -1
- package/dist/components/Gallery/types.d.ts +5 -0
- package/dist/components/Gallery/types.d.ts.map +1 -1
- package/dist/components/GameDesigner.d.ts.map +1 -1
- package/dist/components/GameDesigner.js +45 -3
- package/dist/components/GameDesigner.js.map +1 -1
- package/dist/components/InlineGalleryDisplay.d.ts.map +1 -1
- package/dist/components/InlineGalleryDisplay.js +33 -6
- package/dist/components/InlineGalleryDisplay.js.map +1 -1
- package/dist/components/Panel/ExternalDrag.d.ts +30 -0
- package/dist/components/Panel/ExternalDrag.d.ts.map +1 -0
- package/dist/components/Panel/ExternalDrag.js +87 -0
- package/dist/components/Panel/ExternalDrag.js.map +1 -0
- package/dist/components/Panel/PanelContents.d.ts +3 -0
- package/dist/components/Panel/PanelContents.d.ts.map +1 -1
- package/dist/components/Panel/PanelContents.js +24 -0
- package/dist/components/Panel/PanelContents.js.map +1 -1
- package/dist/components/PanelSpark.d.ts.map +1 -1
- package/dist/components/PanelSpark.js +3 -1
- package/dist/components/PanelSpark.js.map +1 -1
- package/dist/components/TopBar.d.ts.map +1 -1
- package/dist/components/TopBar.js +3 -1
- package/dist/components/TopBar.js.map +1 -1
- package/dist/components/TopBarPlayers.d.ts.map +1 -1
- package/dist/components/TopBarPlayers.js +1 -1
- package/dist/components/TopBarPlayers.js.map +1 -1
- package/dist/components/Tutorial/TutorialOverlay.js +17 -2
- package/dist/components/Tutorial/TutorialOverlay.js.map +1 -1
- package/dist/components/Viewer.d.ts.map +1 -1
- package/dist/components/Viewer.js +1 -0
- package/dist/components/Viewer.js.map +1 -1
- package/dist/game/Chit.d.ts +3 -1
- package/dist/game/Chit.d.ts.map +1 -1
- package/dist/game/Chit.js +4 -1
- package/dist/game/Chit.js.map +1 -1
- package/dist/game/GalleryItemChitChildrenSource.d.ts +1 -0
- package/dist/game/GalleryItemChitChildrenSource.d.ts.map +1 -1
- package/dist/game/GalleryItemChitChildrenSource.js +1 -0
- package/dist/game/GalleryItemChitChildrenSource.js.map +1 -1
- package/dist/game/GalleryItemRawSource.d.ts +1 -0
- package/dist/game/GalleryItemRawSource.d.ts.map +1 -1
- package/dist/game/GalleryItemRawSource.js +1 -0
- package/dist/game/GalleryItemRawSource.js.map +1 -1
- package/dist/game/GameButton.d.ts +8 -0
- package/dist/game/GameButton.d.ts.map +1 -1
- package/dist/game/GameButton.js +13 -1
- package/dist/game/GameButton.js.map +1 -1
- package/dist/game/ModalState.d.ts +3 -0
- package/dist/game/ModalState.d.ts.map +1 -1
- package/dist/game/ModalState.js +2 -0
- package/dist/game/ModalState.js.map +1 -1
- package/dist/game/Pick.d.ts.map +1 -1
- package/dist/game/Pick.js +1 -3
- package/dist/game/Pick.js.map +1 -1
- package/dist/game/PlayerPromptStatusChit.d.ts.map +1 -1
- package/dist/game/PlayerPromptStatusChit.js +1 -3
- package/dist/game/PlayerPromptStatusChit.js.map +1 -1
- package/dist/game/Prompt.d.ts +3 -1
- package/dist/game/Prompt.d.ts.map +1 -1
- package/dist/game/Prompt.js +15 -3
- package/dist/game/Prompt.js.map +1 -1
- package/dist/game/SparkChit.d.ts +6 -0
- package/dist/game/SparkChit.d.ts.map +1 -1
- package/dist/game/SparkChit.js +8 -0
- package/dist/game/SparkChit.js.map +1 -1
- package/dist/game/Turn.d.ts +2 -2
- package/dist/game/Turn.d.ts.map +1 -1
- package/dist/game/Turn.js +6 -9
- package/dist/game/Turn.js.map +1 -1
- package/dist/game/clientTransport/ClientPrompts.d.ts +2 -0
- package/dist/game/clientTransport/ClientPrompts.d.ts.map +1 -1
- package/dist/game/clientTransport/ClientPrompts.js +42 -4
- package/dist/game/clientTransport/ClientPrompts.js.map +1 -1
- package/dist/game/clientTransport/ClientTime.d.ts.map +1 -1
- package/dist/game/clientTransport/ClientTime.js +20 -1
- package/dist/game/clientTransport/ClientTime.js.map +1 -1
- package/dist/game/tutorial/TutorialController.d.ts +9 -1
- package/dist/game/tutorial/TutorialController.d.ts.map +1 -1
- package/dist/game/tutorial/TutorialController.js +21 -8
- package/dist/game/tutorial/TutorialController.js.map +1 -1
- package/dist/game/tutorial/runTutorial.d.ts +3 -2
- package/dist/game/tutorial/runTutorial.d.ts.map +1 -1
- package/dist/game/tutorial/runTutorial.js +28 -8
- package/dist/game/tutorial/runTutorial.js.map +1 -1
- package/dist/hooks/useTimeController.d.ts +2 -0
- package/dist/hooks/useTimeController.d.ts.map +1 -1
- package/dist/hooks/useTimeController.js +4 -0
- package/dist/hooks/useTimeController.js.map +1 -1
- package/dist/hooks/useTutorial.d.ts +4 -1
- package/dist/hooks/useTutorial.d.ts.map +1 -1
- package/dist/hooks/useTutorial.js +2 -2
- package/dist/hooks/useTutorial.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/rendering/ChitGalleryItemInstance.d.ts +13 -3
- package/dist/rendering/ChitGalleryItemInstance.d.ts.map +1 -1
- package/dist/rendering/ChitGalleryItemInstance.js +17 -1
- package/dist/rendering/ChitGalleryItemInstance.js.map +1 -1
- package/dist/rendering/ChitRenderInstance.d.ts +6 -0
- package/dist/rendering/ChitRenderInstance.d.ts.map +1 -1
- package/dist/rendering/ChitRenderInstance.js +21 -4
- package/dist/rendering/ChitRenderInstance.js.map +1 -1
- package/dist/rendering/LightWrapper.d.ts.map +1 -1
- package/dist/rendering/LightWrapper.js +10 -1
- package/dist/rendering/LightWrapper.js.map +1 -1
- package/dist/rendering/Splay.d.ts +11 -0
- package/dist/rendering/Splay.d.ts.map +1 -1
- package/dist/rendering/Splay.js +20 -10
- package/dist/rendering/Splay.js.map +1 -1
- package/dist/utilities/CanvasStack/RichTextRenderer.d.ts.map +1 -1
- package/dist/utilities/CanvasStack/RichTextRenderer.js +12 -0
- package/dist/utilities/CanvasStack/RichTextRenderer.js.map +1 -1
- package/dist/utilities/Dice.d.ts +2 -0
- package/dist/utilities/Dice.d.ts.map +1 -1
- package/dist/utilities/Dice.js +5 -1
- package/dist/utilities/Dice.js.map +1 -1
- package/dist/utilities/GalleryItemConversion.d.ts.map +1 -1
- package/dist/utilities/GalleryItemConversion.js +5 -7
- package/dist/utilities/GalleryItemConversion.js.map +1 -1
- package/package.json +1 -1
- package/src/library/components/DemoWrapper.tsx +5 -2
- package/src/library/components/Gallery/BuiltItem.ts +63 -8
- package/src/library/components/Gallery/GalleryController.ts +39 -9
- package/src/library/components/Gallery/GalleryViewer.tsx +90 -2
- package/src/library/components/Gallery/LayoutManager.ts +40 -15
- package/src/library/components/Gallery/constants.ts +5 -1
- package/src/library/components/Gallery/types.ts +6 -0
- package/src/library/components/GameDesigner.tsx +46 -2
- package/src/library/components/InlineGalleryDisplay.tsx +36 -6
- package/src/library/components/Panel/ExternalDrag.ts +122 -0
- package/src/library/components/Panel/PanelContents.tsx +26 -0
- package/src/library/components/PanelSpark.tsx +3 -1
- package/src/library/components/TopBar.tsx +2 -1
- package/src/library/components/TopBarPlayers.tsx +1 -6
- package/src/library/components/Tutorial/TutorialOverlay.tsx +16 -1
- package/src/library/components/Viewer.tsx +1 -0
- package/src/library/game/Chit.ts +7 -2
- package/src/library/game/GalleryItemChitChildrenSource.ts +1 -0
- package/src/library/game/GalleryItemRawSource.ts +1 -0
- package/src/library/game/GameButton.ts +13 -1
- package/src/library/game/ModalState.ts +3 -0
- package/src/library/game/Pick.ts +1 -3
- package/src/library/game/PlayerPromptStatusChit.ts +1 -3
- package/src/library/game/Prompt.ts +15 -4
- package/src/library/game/SparkChit.ts +9 -0
- package/src/library/game/Turn.ts +6 -9
- package/src/library/game/clientTransport/ClientPrompts.ts +45 -4
- package/src/library/game/clientTransport/ClientTime.ts +21 -1
- package/src/library/game/tutorial/TUTORIAL_GUIDE.md +11 -6
- package/src/library/game/tutorial/TutorialController.test.ts +4 -4
- package/src/library/game/tutorial/TutorialController.ts +20 -7
- package/src/library/game/tutorial/runTutorial.ts +29 -10
- package/src/library/hooks/useTimeController.tsx +4 -0
- package/src/library/hooks/useTutorial.tsx +6 -2
- package/src/library/index.ts +1 -0
- package/src/library/rendering/ChitGalleryItemInstance.ts +18 -1
- package/src/library/rendering/ChitRenderInstance.ts +23 -4
- package/src/library/rendering/LightWrapper.ts +10 -1
- package/src/library/rendering/Splay.test.ts +60 -0
- package/src/library/rendering/Splay.ts +30 -9
- package/src/library/utilities/CanvasStack/RichTextRenderer.ts +13 -0
- package/src/library/utilities/Dice.tsx +5 -1
- package/src/library/utilities/GalleryItemConversion.ts +5 -6
- package/dist/index.html +0 -12
- package/dist/main.0792d734cde2c688d5f7.hot-update.js +0 -16991
- package/dist/main.0792d734cde2c688d5f7.hot-update.js.map +0 -1
- package/dist/main.0792d734cde2c688d5f7.hot-update.json +0 -1
- package/dist/pretty-chitty.js +0 -204513
- package/dist/pretty-chitty.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dice.js","sourceRoot":"","sources":["../../src/library/utilities/Dice.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,SAAS,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAoC;IAChE,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC;SACjD,QAAQ,CAAC,EAAE,CAAC;SACZ,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC;SAChB,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IACf,OAAO,CACL,MAAC,OAAO,eACN,KAAC,KAAK,IAAC,GAAG,EAAE,GAAG,GAAI,EACnB,KAAC,GAAG,IAAC,MAAM,EAAE,CAAC,YACZ,KAAC,MAAM,IAAC,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,GAAI,GACtC,IACE,CACX,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,QAAS,SAAQ,mBAAmB;IAAjD;;QACE,UAAK,GAAW,CAAC,CAAC;QAClB,oBAAe,GAAW,SAAS,CAAC;QACpC,oBAAe,GAAW,SAAS,CAAC;QACpC,WAAM,GAAG,KAAK,CAAC;QACf,UAAK,GAAG,GAAG,CAAC;QACZ,WAAM,GAAG,GAAG,CAAC;QACb,eAAU,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Dice.js","sourceRoot":"","sources":["../../src/library/utilities/Dice.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GalleryItemConversion.d.ts","sourceRoot":"","sources":["../../src/library/utilities/GalleryItemConversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"GalleryItemConversion.d.ts","sourceRoot":"","sources":["../../src/library/utilities/GalleryItemConversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,IAAI,EAAE,6BAyBhD"}
|
|
@@ -10,17 +10,15 @@ export function chitsToGalleryItems(chits) {
|
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
12
|
resultChits.push(chit);
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
result.push(new ChitGalleryItemInstance(chit));
|
|
18
|
-
}
|
|
13
|
+
const item = chit.renderInstance?.currentGalleryItem ?? new ChitGalleryItemInstance(chit);
|
|
14
|
+
// a reused item may still carry the count from an earlier gallery
|
|
15
|
+
item.count = undefined;
|
|
16
|
+
result.push(item);
|
|
19
17
|
});
|
|
20
18
|
for (const [id, count] of Object.entries(dupeCounts)) {
|
|
21
19
|
const dupe = result.find((item) => item.chit.id === id);
|
|
22
20
|
if (dupe) {
|
|
23
|
-
dupe.
|
|
21
|
+
dupe.count = count;
|
|
24
22
|
}
|
|
25
23
|
}
|
|
26
24
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GalleryItemConversion.js","sourceRoot":"","sources":["../../src/library/utilities/GalleryItemConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,MAAM,MAAM,GAA8B,EAAE,CAAC;IAC7C,MAAM,WAAW,GAAW,EAAE,CAAC;IAC/B,MAAM,UAAU,GAA6B,EAAE,CAAC;IAChD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;QACpE,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACpB,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QACD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,IAAI,CAAC,cAAc,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"GalleryItemConversion.js","sourceRoot":"","sources":["../../src/library/utilities/GalleryItemConversion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,MAAM,MAAM,GAA8B,EAAE,CAAC;IAC7C,MAAM,WAAW,GAAW,EAAE,CAAC;IAC/B,MAAM,UAAU,GAA6B,EAAE,CAAC;IAChD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;QACpE,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACpB,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QACD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,kBAAkB,IAAI,IAAI,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC1F,kEAAkE;QAClE,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACxD,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -76,6 +76,9 @@ export type DemoWrapperProps = {
|
|
|
76
76
|
onLoadProgress?: LoadingStatesCallback;
|
|
77
77
|
/** Start the tutorial at this step (the Playground's "restart at step") */
|
|
78
78
|
startAt?: number;
|
|
79
|
+
/** Go straight to this step (by id) once the board loads, playing the script up to it headlessly: a reload
|
|
80
|
+
* that comes back to where the player was */
|
|
81
|
+
resumeAt?: string;
|
|
79
82
|
/** Rendered alongside the match once it exists (the Playground's dev panel) */
|
|
80
83
|
children?: React.ReactNode;
|
|
81
84
|
};
|
|
@@ -94,6 +97,7 @@ export function DemoWrapper({
|
|
|
94
97
|
onBack,
|
|
95
98
|
onLoadProgress,
|
|
96
99
|
startAt = 0,
|
|
100
|
+
resumeAt,
|
|
97
101
|
children,
|
|
98
102
|
}: DemoWrapperProps) {
|
|
99
103
|
const [loadingStates] = useState<LoadingStates>(new LoadingStates());
|
|
@@ -148,9 +152,7 @@ export function DemoWrapper({
|
|
|
148
152
|
const current = demoRef.current;
|
|
149
153
|
if (!current) return false;
|
|
150
154
|
if (!current.runtime.hasSnapshot(stepId) && specRef.current) {
|
|
151
|
-
const T0 = performance.now();
|
|
152
155
|
const run = await runTutorial(game, specRef.current, { until: stepId, stepTimeoutMs: 5000 });
|
|
153
|
-
console.info("ZZTIME headless", Math.round(performance.now() - T0));
|
|
154
156
|
if (demoRef.current !== current) return false;
|
|
155
157
|
if (!run.runtime.hasSnapshot(stepId)) {
|
|
156
158
|
console.warn(
|
|
@@ -194,6 +196,7 @@ export function DemoWrapper({
|
|
|
194
196
|
startAt={start.at}
|
|
195
197
|
autoStart={start.auto}
|
|
196
198
|
startPaused={start.paused}
|
|
199
|
+
resumeAt={resumeAt}
|
|
197
200
|
snapshot={snapshot}
|
|
198
201
|
rewind={rewind}
|
|
199
202
|
>
|
|
@@ -28,7 +28,13 @@ export class BuiltItem {
|
|
|
28
28
|
|
|
29
29
|
// to be implemented soon
|
|
30
30
|
private summaryMesh?: Object3D;
|
|
31
|
+
/** the summary's natural height (all of its text, never shrunk in the full gallery) */
|
|
31
32
|
private summaryHeight: number;
|
|
33
|
+
/** the height it takes on screen: in the full gallery the window it scrolls in */
|
|
34
|
+
private summaryVisibleHeight = 0;
|
|
35
|
+
/** full gallery: how far this item's own summary is scrolled (each summary scrolls on its own) */
|
|
36
|
+
private summaryScrollOffset = 0;
|
|
37
|
+
private summaryScrollDirty = true;
|
|
32
38
|
|
|
33
39
|
private center: Vector3;
|
|
34
40
|
private _baseOffsetX: number;
|
|
@@ -225,11 +231,13 @@ export class BuiltItem {
|
|
|
225
231
|
if (this.enterLeaveTween) {
|
|
226
232
|
this.enterLeaveTween.update();
|
|
227
233
|
}
|
|
234
|
+
const rewindowed = this.applySummaryScroll();
|
|
228
235
|
if (this.dirty) {
|
|
229
236
|
this.positionGroup();
|
|
230
237
|
this.dirty = false;
|
|
231
238
|
return true;
|
|
232
239
|
}
|
|
240
|
+
if (rewindowed) return true;
|
|
233
241
|
return false;
|
|
234
242
|
}
|
|
235
243
|
|
|
@@ -245,13 +253,14 @@ export class BuiltItem {
|
|
|
245
253
|
|
|
246
254
|
private positionGroup() {
|
|
247
255
|
const { frontStageWidth, itemsPerPage, itemSpacing } = this.layoutManager.getStageDimensions();
|
|
248
|
-
const { w: itemWidth
|
|
256
|
+
const { w: itemWidth } = this.layoutManager.getItemDimensions();
|
|
249
257
|
const { h } = this.layoutManager.getDimensions();
|
|
250
258
|
const initialOffset = -(frontStageWidth / 2 - itemWidth / 2);
|
|
251
259
|
const targetX = initialOffset + this.index * (itemWidth + itemSpacing) + this._baseOffsetX;
|
|
260
|
+
const summaryViewport = this.layoutManager.getSummaryViewportHeight();
|
|
252
261
|
|
|
253
262
|
this.group.position.y =
|
|
254
|
-
(1 - this.enteredAmount) * -h +
|
|
263
|
+
(1 - this.enteredAmount) * -h + summaryViewport / 2 + (summaryViewport > 0 ? this.theme.spacing / 2 : 0);
|
|
255
264
|
|
|
256
265
|
this.group.position.x = targetX;
|
|
257
266
|
|
|
@@ -263,7 +272,9 @@ export class BuiltItem {
|
|
|
263
272
|
this.applyOvershootEffect(-(initialOffset - targetX), largestX, initialOffset);
|
|
264
273
|
this.repositionSummary(-(initialOffset - targetX));
|
|
265
274
|
} else {
|
|
275
|
+
// back on the front stage: undo any overshoot tilt (an item built at a stale pan offset starts overshot)
|
|
266
276
|
this.group.position.z = 0;
|
|
277
|
+
this.group.rotation.y = 0;
|
|
267
278
|
this.repositionSummary(0);
|
|
268
279
|
}
|
|
269
280
|
}
|
|
@@ -308,13 +319,41 @@ export class BuiltItem {
|
|
|
308
319
|
|
|
309
320
|
repositionSummary(overshootX: number) {
|
|
310
321
|
if (this.summaryMesh) {
|
|
311
|
-
|
|
312
|
-
const
|
|
313
|
-
this.summaryMesh.position.y = -
|
|
322
|
+
// directly under the item as it draws (an item narrower or shorter than its slot keeps its text close)
|
|
323
|
+
const drawnHalf = (this._meshSize.y * this.mesh.scale.y) / 2;
|
|
324
|
+
this.summaryMesh.position.y = -this.summaryVisibleHeight / 2 - drawnHalf - this.theme.spacing;
|
|
314
325
|
this.summaryMesh.position.x = (overshootX * this.zFactor) / 3;
|
|
315
326
|
}
|
|
316
327
|
}
|
|
317
328
|
|
|
329
|
+
/** Full gallery: scroll this item's summary by `delta` (positive reads further down). Returns true when it moved. */
|
|
330
|
+
scrollSummary(delta: number): boolean {
|
|
331
|
+
const max = Math.max(0, this.summaryHeight - this.summaryVisibleHeight);
|
|
332
|
+
const next = Math.max(0, Math.min(max, this.summaryScrollOffset + delta));
|
|
333
|
+
if (next === this.summaryScrollOffset) return false;
|
|
334
|
+
this.summaryScrollOffset = next;
|
|
335
|
+
this.summaryScrollDirty = true;
|
|
336
|
+
return true;
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
/** Full gallery: show the scrolled window of the summary's texture. Returns true when it moved. */
|
|
340
|
+
private applySummaryScroll(): boolean {
|
|
341
|
+
const mesh = this.summaryMesh as Mesh | undefined;
|
|
342
|
+
if (!mesh || this.summaryVisibleHeight >= this.summaryHeight - 0.5) return false;
|
|
343
|
+
if (!this.summaryScrollDirty) return false;
|
|
344
|
+
this.summaryScrollDirty = false;
|
|
345
|
+
const total = this.summaryHeight, visible = this.summaryVisibleHeight;
|
|
346
|
+
const offset = Math.max(0, Math.min(total - visible, this.summaryScrollOffset));
|
|
347
|
+
const top = 1 - offset / total, bottom = 1 - (offset + visible) / total;
|
|
348
|
+
const uv = mesh.geometry.attributes.uv;
|
|
349
|
+
// the plane's top row of vertices shows `top`, its bottom row `bottom`
|
|
350
|
+
const pos = mesh.geometry.attributes.position;
|
|
351
|
+
for (let i = 0; i < uv.count; i++) uv.setY(i, pos.getY(i) > 0 ? top : bottom);
|
|
352
|
+
uv.needsUpdate = true;
|
|
353
|
+
this.sceneWrapper.markDirty();
|
|
354
|
+
return true;
|
|
355
|
+
}
|
|
356
|
+
|
|
318
357
|
private getSummaryText() {
|
|
319
358
|
if (this.layoutManager.getSummaryMode() === "full") {
|
|
320
359
|
return this.item.summary ?? this.item.shortSummary;
|
|
@@ -341,7 +380,9 @@ export class BuiltItem {
|
|
|
341
380
|
private _lastSummaryMeshKey = "";
|
|
342
381
|
private checkRecreateSummaryMesh() {
|
|
343
382
|
const { w, maxHeight } = this.layoutManager.getSummaryDimensions();
|
|
344
|
-
|
|
383
|
+
// The text is part of the key: an item kept across updates (a gallery swapped in place)
|
|
384
|
+
// must redraw its caption when its chit's summary changes, not only when it resizes.
|
|
385
|
+
const key = `${w}x${maxHeight}:${this.getSummaryText() ?? ""}`;
|
|
345
386
|
if (this._lastSummaryMeshKey !== key) {
|
|
346
387
|
this.createHelpText();
|
|
347
388
|
this._lastSummaryMeshKey = key;
|
|
@@ -365,6 +406,7 @@ export class BuiltItem {
|
|
|
365
406
|
const summary = this.getSummaryText();
|
|
366
407
|
if (!summary) {
|
|
367
408
|
this.summaryHeight = 0;
|
|
409
|
+
this.summaryVisibleHeight = 0;
|
|
368
410
|
return;
|
|
369
411
|
}
|
|
370
412
|
|
|
@@ -389,8 +431,9 @@ export class BuiltItem {
|
|
|
389
431
|
new PadCanvasOperation({ top: pad, bottom: pad, left: pad, right: pad }, markdown),
|
|
390
432
|
]);
|
|
391
433
|
|
|
392
|
-
|
|
393
|
-
|
|
434
|
+
const full = this.layoutManager.getSummaryMode() === "full";
|
|
435
|
+
// A tall area to let all of the text flow (the full gallery shows all of it, scrolling)
|
|
436
|
+
const height = full ? Math.max(itemHeight * 2, 3000) : itemHeight * 2;
|
|
394
437
|
|
|
395
438
|
// First pass: render with full height to let text flow and calculate actual size
|
|
396
439
|
const stack1 = new CanvasStack(summaryWidth * window.devicePixelRatio, height * window.devicePixelRatio, ops);
|
|
@@ -407,6 +450,17 @@ export class BuiltItem {
|
|
|
407
450
|
|
|
408
451
|
const finalHeight = stack2.height / window.devicePixelRatio;
|
|
409
452
|
|
|
453
|
+
if (full) {
|
|
454
|
+
// Never shrunk: shown through a window as tall as the space under the item, scrolled by a vertical swipe
|
|
455
|
+
const visible = summaryMaxHeight > 0 ? Math.min(finalHeight, summaryMaxHeight) : finalHeight;
|
|
456
|
+
const mesh = new Mesh(new PlaneGeometry(summaryWidth, visible), material);
|
|
457
|
+
this.summaryHeight = finalHeight;
|
|
458
|
+
this.summaryVisibleHeight = visible;
|
|
459
|
+
this.summaryScrollOffset = Math.min(this.summaryScrollOffset, Math.max(0, finalHeight - visible));
|
|
460
|
+
this.summaryScrollDirty = true;
|
|
461
|
+
return mesh;
|
|
462
|
+
}
|
|
463
|
+
|
|
410
464
|
const geometry = new PlaneGeometry(summaryWidth, finalHeight);
|
|
411
465
|
const mesh = new Mesh(geometry, material);
|
|
412
466
|
|
|
@@ -418,6 +472,7 @@ export class BuiltItem {
|
|
|
418
472
|
} else {
|
|
419
473
|
this.summaryHeight = finalHeight;
|
|
420
474
|
}
|
|
475
|
+
this.summaryVisibleHeight = this.summaryHeight;
|
|
421
476
|
return mesh;
|
|
422
477
|
}
|
|
423
478
|
}
|
|
@@ -173,17 +173,20 @@ export class GalleryController implements TextureReferenceCounterRootGroup {
|
|
|
173
173
|
// that here the same way RootChitRenderInstance does so the canvas repaints.
|
|
174
174
|
let changed = this.dirty || this.sceneWrapper.isDirty();
|
|
175
175
|
|
|
176
|
+
// The summaries' height is part of the layout. Items built since the last layout pass (a gallery swapped in place)
|
|
177
|
+
// bring summaries the layout has not measured yet, so re-measure every frame: setSummaryMaxHeight only marks the
|
|
178
|
+
// layout dirty when the height actually changed.
|
|
179
|
+
const syncSummaryHeight = () => {
|
|
180
|
+
if (this.items.length > 0) {
|
|
181
|
+
this.layoutManager.setSummaryMaxHeight(Math.max(...this.items.map((item) => item.getSummaryHeight())));
|
|
182
|
+
}
|
|
183
|
+
};
|
|
184
|
+
syncSummaryHeight();
|
|
176
185
|
while (this.layoutManager.dirty) {
|
|
177
186
|
changed = true;
|
|
178
187
|
this.items.forEach((item) => item.layoutDirty());
|
|
179
188
|
this.layoutManager.dirty = false;
|
|
180
|
-
|
|
181
|
-
const newMaxHeight =
|
|
182
|
-
this.items.length === 0
|
|
183
|
-
? this.layoutManager.getSummaryMaxHeight()
|
|
184
|
-
: Math.max(...this.items.map((item) => item.getSummaryHeight()));
|
|
185
|
-
|
|
186
|
-
this.layoutManager.setSummaryMaxHeight(newMaxHeight);
|
|
189
|
+
syncSummaryHeight();
|
|
187
190
|
}
|
|
188
191
|
|
|
189
192
|
changed = this.animationController.update() || changed;
|
|
@@ -208,6 +211,31 @@ export class GalleryController implements TextureReferenceCounterRootGroup {
|
|
|
208
211
|
this.animationController.pan(deltaX, animate, this.items, itemsPerPage, itemWidth, itemSpacing, w);
|
|
209
212
|
}
|
|
210
213
|
|
|
214
|
+
/** Full gallery: whether some summary is longer than the space under its item */
|
|
215
|
+
canScrollSummaries() {
|
|
216
|
+
return this.layoutManager.canScrollSummaries();
|
|
217
|
+
}
|
|
218
|
+
/** Full gallery: scroll the summary in the column at `x` (only that one) by `delta` (positive reads further down) */
|
|
219
|
+
scrollSummaries(delta: number, x: number) {
|
|
220
|
+
if (this.builtItemInColumn(x)?.scrollSummary(delta)) this.dirty = true;
|
|
221
|
+
}
|
|
222
|
+
/** The item whose column (item and summary) contains `x`, whatever the height */
|
|
223
|
+
private builtItemInColumn(x: number): BuiltItem | undefined {
|
|
224
|
+
const { w } = this.layoutManager.getDimensions();
|
|
225
|
+
const { w: itemWidth } = this.layoutManager.getItemDimensions();
|
|
226
|
+
const { frontStageWidth, itemSpacing } = this.layoutManager.getStageDimensions();
|
|
227
|
+
const index = (-this.animationController.getOffsetX() + x - (w - frontStageWidth) / 2) / (itemWidth + itemSpacing);
|
|
228
|
+
return this.items.find((item) => index >= item.getIndex() - itemSpacing / 2 / (itemWidth + itemSpacing) && index < item.getIndex() + 1);
|
|
229
|
+
}
|
|
230
|
+
/** The y (from the top of the gallery) where the summaries start: below it a wheel scrolls them */
|
|
231
|
+
summariesTop() {
|
|
232
|
+
const { h } = this.layoutManager.getDimensions();
|
|
233
|
+
const { h: itemH } = this.layoutManager.getItemDimensions();
|
|
234
|
+
const viewport = this.layoutManager.getSummaryViewportHeight();
|
|
235
|
+
const groupY = viewport / 2 + (viewport > 0 ? this.theme.spacing / 2 : 0);
|
|
236
|
+
return h / 2 - (groupY - itemH / 2);
|
|
237
|
+
}
|
|
238
|
+
|
|
211
239
|
setItems(items: GalleryItem[]) {
|
|
212
240
|
const prevItemCount = this.items.length;
|
|
213
241
|
if (items.length > 0) {
|
|
@@ -263,8 +291,10 @@ export class GalleryController implements TextureReferenceCounterRootGroup {
|
|
|
263
291
|
// TODO: this is wrong-ish
|
|
264
292
|
this.cameraManager.updateCameraPosition(0);
|
|
265
293
|
|
|
266
|
-
|
|
267
|
-
|
|
294
|
+
// A changed set of items re-settles the pan (pan stops any running tween), even mid-animation: otherwise a
|
|
295
|
+
// gallery swapped in while the last one was still easing keeps that one's scroll offset, and its items sit off
|
|
296
|
+
// the front stage.
|
|
297
|
+
if (newItems.length > 0 || itemsToDelete.length > 0 || this.items.length !== prevItemCount) {
|
|
268
298
|
this.pan(0, true);
|
|
269
299
|
}
|
|
270
300
|
}
|
|
@@ -13,6 +13,8 @@ import { GalleryItem, SummaryMode } from "./types";
|
|
|
13
13
|
import { GalleryKind, galleryRegistry } from "./registry";
|
|
14
14
|
import { Chit } from "../../game/Chit";
|
|
15
15
|
import { ChitGalleryItemInstance } from "../../rendering/ChitGalleryItemInstance";
|
|
16
|
+
import { useModalState } from "../../hooks/useModalState";
|
|
17
|
+
import type { ExternalDrag } from "../Panel/ExternalDrag";
|
|
16
18
|
import {
|
|
17
19
|
DEFAULT_TWEEN_DURATION,
|
|
18
20
|
DEFAULT_FOV,
|
|
@@ -85,6 +87,7 @@ export function GalleryViewer({
|
|
|
85
87
|
const refContainer = useRef<HTMLCanvasElement>(null);
|
|
86
88
|
const rendererWrapper = useWebGlRenderer();
|
|
87
89
|
const theme = useGameTheme();
|
|
90
|
+
const modalState = useModalState();
|
|
88
91
|
const [galleryController] = useState(() => new GalleryController(new SceneWrapper(new Scene()), theme, angle, fov));
|
|
89
92
|
|
|
90
93
|
galleryController.setTweenDuration(tweenDuration);
|
|
@@ -186,7 +189,10 @@ export function GalleryViewer({
|
|
|
186
189
|
if (!el) return;
|
|
187
190
|
|
|
188
191
|
const hammer = new Hammer.Manager(el);
|
|
189
|
-
|
|
192
|
+
// The inline strip also takes upward drags: a draggable item pulled up goes onto the board.
|
|
193
|
+
const dragsOut = kind === "inline";
|
|
194
|
+
// The full gallery takes vertical drags too: they scroll the summaries when those are longer than their space.
|
|
195
|
+
hammer.add(new Hammer.Pan({ direction: Hammer.DIRECTION_ALL }));
|
|
190
196
|
|
|
191
197
|
const singleTap = new Hammer.Tap({ event: "singletap" });
|
|
192
198
|
const press = new Hammer.Press({ event: "longtap", time: 600 });
|
|
@@ -221,8 +227,62 @@ export function GalleryViewer({
|
|
|
221
227
|
|
|
222
228
|
let lastX: number | undefined = undefined;
|
|
223
229
|
let lastVelocityX = 0;
|
|
230
|
+
// Decided on a gesture's first movement: a pull upward (more than ~30° above horizontal) on
|
|
231
|
+
// an item with a live DragPick drags it out onto the board; anything else scrolls the strip.
|
|
232
|
+
// A scroll that leaves the strip through its top edge turns into a drag of the item it started
|
|
233
|
+
// on, so a long diagonal pull toward the board still lands the piece.
|
|
234
|
+
let mode: "undecided" | "scroll" | "drag" | "summaries" = "undecided";
|
|
235
|
+
let lastY: number | undefined = undefined;
|
|
236
|
+
let summaryX = 0;
|
|
237
|
+
let drag: ExternalDrag | undefined;
|
|
238
|
+
let startItem: GalleryItem | null = null;
|
|
239
|
+
|
|
240
|
+
const draggableChit = (item: GalleryItem | null) => {
|
|
241
|
+
const chit = item instanceof ChitGalleryItemInstance ? item.chit : undefined;
|
|
242
|
+
return chit?.onDrag ? chit : undefined;
|
|
243
|
+
};
|
|
244
|
+
const beginDragOut = (ev: HammerInput): boolean => {
|
|
245
|
+
const chit = draggableChit(startItem);
|
|
246
|
+
if (!chit || !startItem || !modalState.externalDragHost) return false;
|
|
247
|
+
drag = modalState.externalDragHost.begin(chit, startItem, ev.center.x, ev.center.y);
|
|
248
|
+
return !!drag;
|
|
249
|
+
};
|
|
224
250
|
|
|
225
251
|
hammer.on("pan", (ev) => {
|
|
252
|
+
if (mode === "undecided") {
|
|
253
|
+
const rect = el.getBoundingClientRect();
|
|
254
|
+
startItem = dragsOut ? galleryController.getItemAtPosition(ev.center.x - ev.deltaX - rect.left, ev.center.y - ev.deltaY - rect.top) : null;
|
|
255
|
+
const upward = -ev.deltaY > Math.abs(ev.deltaX) * 0.58;
|
|
256
|
+
const vertical = Math.abs(ev.deltaY) > Math.abs(ev.deltaX);
|
|
257
|
+
mode = upward && beginDragOut(ev) ? "drag" : !dragsOut && vertical && galleryController.canScrollSummaries() ? "summaries" : "scroll";
|
|
258
|
+
// a summary drag scrolls the one it started on
|
|
259
|
+
summaryX = ev.center.x - ev.deltaX - rect.left;
|
|
260
|
+
} else if (mode === "scroll" && dragsOut && ev.center.y < el.getBoundingClientRect().top && beginDragOut(ev)) {
|
|
261
|
+
// Put the strip back where the gesture found it, and carry on as a drag.
|
|
262
|
+
if (lastX !== undefined) {
|
|
263
|
+
galleryController.pan(-lastX);
|
|
264
|
+
galleryController.pan(0, true);
|
|
265
|
+
}
|
|
266
|
+
lastX = undefined;
|
|
267
|
+
mode = "drag";
|
|
268
|
+
}
|
|
269
|
+
if (mode === "drag") {
|
|
270
|
+
drag?.move(ev.center.x, ev.center.y);
|
|
271
|
+
ev.preventDefault();
|
|
272
|
+
return;
|
|
273
|
+
}
|
|
274
|
+
if (mode === "summaries") {
|
|
275
|
+
// the text follows the finger: dragging up reads further down
|
|
276
|
+
if (lastY !== undefined) galleryController.scrollSummaries(lastY - ev.deltaY, summaryX);
|
|
277
|
+
lastY = ev.deltaY;
|
|
278
|
+
ev.preventDefault();
|
|
279
|
+
return;
|
|
280
|
+
}
|
|
281
|
+
if (!dragsOut && Math.abs(ev.deltaX) < 1 && lastX === undefined && Math.abs(ev.deltaY) > 0) {
|
|
282
|
+
// a vertical drag with nothing to scroll: leave the strip where it is
|
|
283
|
+
ev.preventDefault();
|
|
284
|
+
return;
|
|
285
|
+
}
|
|
226
286
|
if (lastX === undefined) {
|
|
227
287
|
lastX = 0;
|
|
228
288
|
} else {
|
|
@@ -233,7 +293,26 @@ export function GalleryViewer({
|
|
|
233
293
|
ev.preventDefault();
|
|
234
294
|
});
|
|
235
295
|
|
|
296
|
+
hammer.on("pancancel", () => {
|
|
297
|
+
drag?.cancel();
|
|
298
|
+
drag = undefined;
|
|
299
|
+
mode = "undecided";
|
|
300
|
+
lastY = undefined;
|
|
301
|
+
});
|
|
302
|
+
|
|
236
303
|
hammer.on("panend", () => {
|
|
304
|
+
if (mode === "drag") {
|
|
305
|
+
drag?.end();
|
|
306
|
+
drag = undefined;
|
|
307
|
+
mode = "undecided";
|
|
308
|
+
return;
|
|
309
|
+
}
|
|
310
|
+
if (mode === "summaries") {
|
|
311
|
+
mode = "undecided";
|
|
312
|
+
lastY = undefined;
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
315
|
+
mode = "undecided";
|
|
237
316
|
lastX = undefined;
|
|
238
317
|
galleryController.pan(lastVelocityX * VELOCITY_MULTIPLIER, true);
|
|
239
318
|
lastVelocityX = 0;
|
|
@@ -241,6 +320,15 @@ export function GalleryViewer({
|
|
|
241
320
|
|
|
242
321
|
let wheelTimeout: NodeJS.Timeout;
|
|
243
322
|
const wheelListener = (ev: WheelEvent) => {
|
|
323
|
+
// over the summaries (when they are longer than their space) the wheel reads through them
|
|
324
|
+
if (galleryController.canScrollSummaries()) {
|
|
325
|
+
const rect = el.getBoundingClientRect();
|
|
326
|
+
if (ev.clientY - rect.top > galleryController.summariesTop()) {
|
|
327
|
+
galleryController.scrollSummaries(ev.deltaY, ev.clientX - rect.left);
|
|
328
|
+
ev.preventDefault();
|
|
329
|
+
return;
|
|
330
|
+
}
|
|
331
|
+
}
|
|
244
332
|
const dy = (ev as any).wheelDeltaY as number;
|
|
245
333
|
galleryController.pan(dy / WHEEL_SENSITIVITY, false);
|
|
246
334
|
ev.preventDefault();
|
|
@@ -255,7 +343,7 @@ export function GalleryViewer({
|
|
|
255
343
|
hammer.destroy();
|
|
256
344
|
removeWheelListener(el, wheelListener);
|
|
257
345
|
};
|
|
258
|
-
}, [galleryController, onClose, onLongPress]);
|
|
346
|
+
}, [galleryController, onClose, onLongPress, kind, modalState]);
|
|
259
347
|
|
|
260
348
|
if (!w || !h) {
|
|
261
349
|
return null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { GameTheme } from "../../game/GameTheme";
|
|
2
2
|
import { SummaryMode } from "./types";
|
|
3
|
-
import { MIN_ITEM_HEIGHT_FRACTION,
|
|
3
|
+
import { ITEM_HEIGHT_FRACTION_WITH_SUMMARY, MIN_ITEM_HEIGHT_FRACTION, SUMMARY_MAX_WIDTH } from "./constants";
|
|
4
4
|
|
|
5
5
|
export class LayoutManager {
|
|
6
6
|
// Dimensions (all scaled)
|
|
@@ -76,6 +76,16 @@ export class LayoutManager {
|
|
|
76
76
|
return { w: this.summaryWidth, maxHeight: this.summaryHeightLimit };
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
+
/** The height the summaries take on screen: in the full gallery the window they scroll in, otherwise their height */
|
|
80
|
+
getSummaryViewportHeight() {
|
|
81
|
+
return this.summaryMode === "full" ? Math.min(this.summaryMaxHeight, this.summaryHeightLimit) : this.summaryMaxHeight;
|
|
82
|
+
}
|
|
83
|
+
/** Whether some summary is longer than its window (the full gallery scrolls them) */
|
|
84
|
+
canScrollSummaries() {
|
|
85
|
+
return this.summaryMode === "full" && this.summaryMaxHeight > this.summaryHeightLimit + 1;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
|
|
79
89
|
getStageDimensions() {
|
|
80
90
|
return { frontStageWidth: this.frontStageWidth, itemsPerPage: this.itemsPerPage, itemSpacing: this.itemSpacing };
|
|
81
91
|
}
|
|
@@ -145,20 +155,35 @@ export class LayoutManager {
|
|
|
145
155
|
|
|
146
156
|
itemWidth = Math.max(this.theme.galleryItemMinimumWidth, itemWidth);
|
|
147
157
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
Math.min(itemHeight, availableHeight *
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
158
|
+
let summaryHeightLimit: number;
|
|
159
|
+
let summaryWidth: number;
|
|
160
|
+
if (this.summaryMode === "full" && this.summaryMaxHeight > 0) {
|
|
161
|
+
// The full gallery: the item keeps a fixed, readable share of the height whatever its summary says (it is what
|
|
162
|
+
// the player is looking at), and the summaries sit under it at their natural size, scrolling in what is left.
|
|
163
|
+
itemHeight = Math.min(itemHeight, availableHeight * ITEM_HEIGHT_FRACTION_WITH_SUMMARY);
|
|
164
|
+
itemWidth = Math.max(this.theme.galleryItemMinimumWidth, Math.min(maxItemWidth, itemHeight * aspectRatio));
|
|
165
|
+
itemHeight = itemWidth / aspectRatio;
|
|
166
|
+
summaryHeightLimit = Math.max(0, availableHeight - itemHeight - this.theme.spacing);
|
|
167
|
+
// never wider than a readable measure; side by side, no wider than the item's own slot
|
|
168
|
+
summaryWidth =
|
|
169
|
+
this.itemCount === 1
|
|
170
|
+
? Math.min(SUMMARY_MAX_WIDTH, maxItemWidth)
|
|
171
|
+
: Math.min(SUMMARY_MAX_WIDTH, itemWidth + this.itemSpacing * 0.8);
|
|
172
|
+
} else {
|
|
173
|
+
// The summary takes its height from the item, and the item keeps its shape, so the slot (and the summary laid
|
|
174
|
+
// out at its width) stays as wide as the item actually draws. A narrower summary can wrap taller and shrink the
|
|
175
|
+
// item again, but only down to the height floor, so the layout settles instead of collapsing.
|
|
176
|
+
const itemHeightFloor = Math.max(
|
|
177
|
+
this.theme.galleryItemMinimumHeight,
|
|
178
|
+
Math.min(itemHeight, availableHeight * MIN_ITEM_HEIGHT_FRACTION),
|
|
179
|
+
);
|
|
180
|
+
summaryHeightLimit = Math.max(0, availableHeight - itemHeightFloor);
|
|
181
|
+
itemHeight = Math.max(itemHeightFloor, Math.min(itemHeight, availableHeight - this.summaryMaxHeight));
|
|
182
|
+
itemWidth = Math.max(this.theme.galleryItemMinimumWidth, itemHeight * aspectRatio);
|
|
183
|
+
// Each caption is as wide as its item, however many items there are: a lone item's caption looks just as it
|
|
184
|
+
// would beside a second one (a stage-wide caption read as a bar under a short label).
|
|
185
|
+
summaryWidth = itemWidth;
|
|
186
|
+
}
|
|
162
187
|
|
|
163
188
|
const itemsPerPage = Math.max(
|
|
164
189
|
1,
|
|
@@ -11,4 +11,8 @@ export const DEFAULT_ITEM_WIDTH = 200;
|
|
|
11
11
|
export const DEFAULT_ITEM_SPACING = 50;
|
|
12
12
|
export const DEFAULT_Z_FACTOR = 3;
|
|
13
13
|
export const MIN_ITEM_HEIGHT_FRACTION = 0.4;
|
|
14
|
-
|
|
14
|
+
/** Full gallery: the items keep this share of the height (never shrunk for their summaries); the summaries scroll in
|
|
15
|
+
* the rest */
|
|
16
|
+
export const ITEM_HEIGHT_FRACTION_WITH_SUMMARY = 0.6;
|
|
17
|
+
/** Full gallery: a summary is never wider than a readable measure, however wide its item (scaled px) */
|
|
18
|
+
export const SUMMARY_MAX_WIDTH = 380;
|
|
@@ -41,6 +41,12 @@ export interface GalleryItemSource {
|
|
|
41
41
|
close(): void;
|
|
42
42
|
|
|
43
43
|
inlineGallerySize?: number;
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* Opt-in (see `ToggleGalleryButton.holdOnCloseMs`): how long the inline strip keeps this
|
|
47
|
+
* source's items and height after the source is closed, waiting for the next one.
|
|
48
|
+
*/
|
|
49
|
+
inlineHoldOnCloseMs?: number;
|
|
44
50
|
}
|
|
45
51
|
|
|
46
52
|
export interface GallerySizeConfig {
|