From 23188152c91a8e638ab832fa1fa122d59d1fc391 Mon Sep 17 00:00:00 2001
From: Catalin Mititiuc
Date: Thu, 8 Aug 2024 15:27:12 -0700
Subject: Add additional params to observable calls; reveal counter and record
logic on selections
---
src/index.js | 3 +--
src/modules/gameboard.js | 18 +++++++++---------
src/modules/observable.js | 4 ++--
src/modules/record_sheet.js | 8 ++++----
4 files changed, 16 insertions(+), 17 deletions(-)
(limited to 'src')
diff --git a/src/index.js b/src/index.js
index a8e0c4b..89af2a1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -172,8 +172,7 @@ document.querySelectorAll('.end-turn').forEach(el =>
gameboard.clearFiringArcs(opponent);
if (opponentRecords.length > 0) {
- Observable.notify('select', opponentRecords.at(0));
- //firstOpponentRecord.scrollIntoView({ behavior: 'smooth' });
+ Observable.notify('select', opponentRecords.at(0), { revealCounter: true, revealRecord: true });
}
})
);
diff --git a/src/modules/gameboard.js b/src/modules/gameboard.js
index e8fe575..6359083 100644
--- a/src/modules/gameboard.js
+++ b/src/modules/gameboard.js
@@ -181,10 +181,10 @@ function hasPreviousMoveInHistory(counter) {
}
function selectOffBoard() {
- Observable.notify('select', this);
+ Observable.notify('select', this, { revealRecord: true });
}
-function select(data) {
+function select(data, opts) {
const counter = data && (soldier.getCounter(svg, data) || soldier.createCounter(data));
const isSelected = data && data.classList && data.classList.contains('selected');
@@ -192,12 +192,12 @@ function select(data) {
if (isSelected || !data) return;
- counter.classList.add(soldier.getSelectedClass());
- const gb = svg.querySelector('.gameboard');
-
- // TODO check if counter is on board before calling
- manualPan(gb, counter);
+ if (opts?.revealCounter) {
+ const gb = svg.querySelector('.gameboard');
+ if (gb.contains(counter)) manualPan(gb, counter);
+ }
+ counter.classList.add(soldier.getSelectedClass());
firingArc.get(svg, counter).forEach(el => el.removeAttribute('clip-path'));
placing.push(counter);
}
@@ -362,10 +362,10 @@ export function start(el) {
if (toPlace === occupant) {
Observable.notify('select');
} else {
- Observable.notify('select', occupant);
+ Observable.notify('select', occupant, { revealRecord: true });
}
} else if (!toPlace && occupant) {
- Observable.notify('select', occupant);
+ Observable.notify('select', occupant, { revealRecord: true });
}
const selected = getSelected();
diff --git a/src/modules/observable.js b/src/modules/observable.js
index c9bea9b..65394f6 100644
--- a/src/modules/observable.js
+++ b/src/modules/observable.js
@@ -1,8 +1,8 @@
const observers = {};
export const Observable = Object.freeze({
- notify: (event, data) => {
- (observers[event] || []).forEach((observer) => observer(data))
+ notify: (event, ...data) => {
+ (observers[event] || []).forEach((observer) => observer(...data))
},
subscribe: (event, func) => {
diff --git a/src/modules/record_sheet.js b/src/modules/record_sheet.js
index 241725d..fb0b037 100644
--- a/src/modules/record_sheet.js
+++ b/src/modules/record_sheet.js
@@ -359,7 +359,7 @@ function reveal(record) {
record.scrollIntoView({ behavior: 'smooth' });
}
-function select(data) {
+function select(data, opts) {
const record = data && getRecord(data);
const isSelected = record?.classList.contains('selected');
@@ -367,7 +367,7 @@ function select(data) {
if (isSelected || !data) return;
- reveal(record);
+ if (opts?.revealRecord) reveal(record);
record.classList.add('selected');
}
@@ -381,7 +381,7 @@ function endMove() {
selected.classList.toggle('movement-ended');
deselect();
- if (next) Observable.notify('select', next);
+ if (next) Observable.notify('select', next, { revealCounter: true, revealRecord: true });
}
}
@@ -421,7 +421,7 @@ export function start(startLoc, units) {
}
document.querySelectorAll('.soldier-record').forEach(el =>
- el.addEventListener('click', () => Observable.notify('select', el))
+ el.addEventListener('click', () => Observable.notify('select', el, { revealCounter: true }))
);
Observable.subscribe('select', select);
--
cgit v1.2.3