@gamepark/react-game 6.31.2 → 6.31.4
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/ImagesLoader/ImagesLoader.js +6 -3
- package/dist/components/ImagesLoader/ImagesLoader.js.map +1 -1
- package/dist/components/JournalTabs/History/History.js +6 -1
- package/dist/components/JournalTabs/History/History.js.map +1 -1
- package/dist/components/PlayerPanel/StyledPlayerPanel.d.ts +0 -1
- package/dist/components/PlayerPanel/StyledPlayerPanel.js +1 -1
- package/dist/components/PlayerPanel/StyledPlayerPanel.js.map +1 -1
- package/dist/hooks/useFlatHistory.js +32 -18
- package/dist/hooks/useFlatHistory.js.map +1 -1
- package/package.json +1 -1
|
@@ -4,18 +4,21 @@ exports.ImagesLoader = void 0;
|
|
|
4
4
|
var jsx_runtime_1 = require("@emotion/react/jsx-runtime");
|
|
5
5
|
/** @jsxImportSource @emotion/react */
|
|
6
6
|
var react_1 = require("react");
|
|
7
|
-
var Picture_1 = require("../Picture");
|
|
8
7
|
var hooks_1 = require("../../hooks");
|
|
8
|
+
var Picture_1 = require("../Picture");
|
|
9
9
|
var ImagesLoader = function (_a) {
|
|
10
10
|
var images = _a.images, onImagesLoad = _a.onImagesLoad;
|
|
11
11
|
var webp = (0, hooks_1.useWebP)();
|
|
12
12
|
var loadCount = (0, react_1.useRef)(0);
|
|
13
|
-
var onLoad =
|
|
13
|
+
var onLoad = function () {
|
|
14
14
|
loadCount.current++;
|
|
15
15
|
if (onImagesLoad && loadCount.current === images.length) {
|
|
16
16
|
onImagesLoad();
|
|
17
17
|
}
|
|
18
|
-
}
|
|
18
|
+
};
|
|
19
|
+
if (onImagesLoad && images.length === 0) {
|
|
20
|
+
onImagesLoad();
|
|
21
|
+
}
|
|
19
22
|
if (webp === undefined)
|
|
20
23
|
return null;
|
|
21
24
|
return ((0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: images.map(function (image, index) { return (0, jsx_runtime_1.jsx)(Picture_1.Picture, { src: image, alt: "", style: { display: 'none' }, onLoad: onLoad }, index); }) }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImagesLoader.js","sourceRoot":"","sources":["../../../src/components/ImagesLoader/ImagesLoader.tsx"],"names":[],"mappings":";;;;AAAA,sCAAsC;AACtC,+
|
|
1
|
+
{"version":3,"file":"ImagesLoader.js","sourceRoot":"","sources":["../../../src/components/ImagesLoader/ImagesLoader.tsx"],"names":[],"mappings":";;;;AAAA,sCAAsC;AACtC,+BAA8B;AAC9B,qCAAqC;AACrC,sCAAoC;AAO7B,IAAM,YAAY,GAAG,UAAC,EAA2C;QAAzC,MAAM,YAAA,EAAE,YAAY,kBAAA;IACjD,IAAM,IAAI,GAAG,IAAA,eAAO,GAAE,CAAA;IACtB,IAAM,SAAS,GAAG,IAAA,cAAM,EAAC,CAAC,CAAC,CAAA;IAC3B,IAAM,MAAM,GAAG;QACb,SAAS,CAAC,OAAO,EAAE,CAAA;QACnB,IAAI,YAAY,IAAI,SAAS,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,EAAE;YACvD,YAAY,EAAE,CAAA;SACf;IACH,CAAC,CAAA;IACD,IAAI,YAAY,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvC,YAAY,EAAE,CAAA;KACf;IACD,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAA;IACnC,OAAO,CACL,2DACG,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,EAAE,KAAK,IAAK,OAAA,uBAAC,iBAAO,IAAa,GAAG,EAAE,KAAK,EAAE,GAAG,EAAC,EAAE,EAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,IAApE,KAAK,CAAkE,EAArF,CAAqF,CAAC,GACnH,CACJ,CAAA;AACH,CAAC,CAAA;AAlBY,QAAA,YAAY,gBAkBxB"}
|
|
@@ -46,7 +46,12 @@ var History = function (props) {
|
|
|
46
46
|
var _a = scrollRef.current, scrollHeight = _a.scrollHeight, clientHeight = _a.clientHeight;
|
|
47
47
|
scrollRef.current.scrollTo({ top: scrollHeight - clientHeight });
|
|
48
48
|
}, [open]);
|
|
49
|
-
return ((0, jsx_runtime_1.jsx)(react_1.ThemeProvider, __assign({ theme: function (theme) { return (__assign(__assign({}, theme), { buttons: exports.historyButtonCss })); } }, { children: (0, jsx_runtime_1.jsx)("div", __assign({ css: scrollCss, ref: scrollRef }, rest, { children: (0, jsx_runtime_1.jsxs)("div", __assign({ css: scrollContentCss }, { children: [(0, jsx_runtime_1.jsx)(StartGameHistory_1.StartGameHistory, {}), history.map(function (h) {
|
|
49
|
+
return ((0, jsx_runtime_1.jsx)(react_1.ThemeProvider, __assign({ theme: function (theme) { return (__assign(__assign({}, theme), { buttons: exports.historyButtonCss })); } }, { children: (0, jsx_runtime_1.jsx)("div", __assign({ css: scrollCss, ref: scrollRef }, rest, { children: (0, jsx_runtime_1.jsxs)("div", __assign({ css: scrollContentCss }, { children: [(0, jsx_runtime_1.jsx)(StartGameHistory_1.StartGameHistory, {}), history.map(function (h) {
|
|
50
|
+
if (!h.action.id)
|
|
51
|
+
return null; // wait for server action.id
|
|
52
|
+
var key = h.consequenceIndex !== undefined ? "".concat(h.action.id, "_").concat(h.consequenceIndex) : h.action.id;
|
|
53
|
+
return (0, jsx_runtime_1.jsx)(Log_1.LogItem, { history: h, css: itemCss, customEntryCss: customEntryCss }, key);
|
|
54
|
+
}), (0, jsx_runtime_1.jsx)(GameOverHistory_1.GameOverHistory, {})] })) })) })));
|
|
50
55
|
};
|
|
51
56
|
exports.History = History;
|
|
52
57
|
var scrollCss = (0, react_1.css)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n overflow-x: hidden;\n overflow-y: scroll;\n scrollbar-color: rgba(74, 74, 74, 0.3) transparent;\n scrollbar-width: thin;\n margin-top: 0.5em;\n margin-right: 8px;\n\n &::-webkit-scrollbar {\n width: 6px\n }\n\n &::-webkit-scrollbar-thumb {\n border-radius: 7px;\n background-color: rgba(74, 74, 74, 0.3);\n }\n\n align-self: stretch;\n display: flex;\n flex-direction: column;\n"], ["\n overflow-x: hidden;\n overflow-y: scroll;\n scrollbar-color: rgba(74, 74, 74, 0.3) transparent;\n scrollbar-width: thin;\n margin-top: 0.5em;\n margin-right: 8px;\n\n &::-webkit-scrollbar {\n width: 6px\n }\n\n &::-webkit-scrollbar-thumb {\n border-radius: 7px;\n background-color: rgba(74, 74, 74, 0.3);\n }\n\n align-self: stretch;\n display: flex;\n flex-direction: column;\n"])));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"History.js","sourceRoot":"","sources":["../../../../src/components/JournalTabs/History/History.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAsC;AACtC,wCAAmD;AACnD,+BAA6D;AAC7D,oCAA4C;AAC5C,gEAA8D;AAC9D,iCAAmC;AACnC,qDAAmD;AACnD,uDAAqD;AAM9C,IAAM,OAAO,GAAqB,UAAC,KAAK;IAErC,IAAA,OAAO,GAAK,IAAA,+BAAc,GAAE,QAArB,CAAqB;IAC5B,IAAA,IAAI,GAAc,KAAK,KAAnB,EAAK,IAAI,UAAK,KAAK,EAAzB,QAAiB,CAAF,CAAU;IAC/B,IAAM,SAAS,GAAG,IAAA,cAAM,EAAiB,IAAI,CAAC,CAAA;IAE9C,IAAA,iBAAS,EAAC;QACR,IAAI,CAAC,SAAS,CAAC,OAAO;YAAE,OAAM;QACxB,IAAA,KAAiC,SAAS,CAAC,OAAO,EAAhD,YAAY,kBAAA,EAAE,YAAY,kBAAsB,CAAA;QACxD,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,YAAY,GAAG,YAAY,EAAE,CAAC,CAAA;IAClE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAEV,OAAO,CACL,uBAAC,qBAAa,aAAC,KAAK,EAAE,UAAA,KAAK,IAAI,OAAA,uBAAM,KAAK,KAAE,OAAO,EAAE,wBAAgB,IAAG,EAAzC,CAAyC,gBACtE,yCAAK,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,IAAM,IAAI,cAC3C,0CAAK,GAAG,EAAE,gBAAgB,iBACxB,uBAAC,mCAAgB,KAAE,EAClB,OAAO,CAAC,GAAG,CAAC,UAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"History.js","sourceRoot":"","sources":["../../../../src/components/JournalTabs/History/History.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAsC;AACtC,wCAAmD;AACnD,+BAA6D;AAC7D,oCAA4C;AAC5C,gEAA8D;AAC9D,iCAAmC;AACnC,qDAAmD;AACnD,uDAAqD;AAM9C,IAAM,OAAO,GAAqB,UAAC,KAAK;IAErC,IAAA,OAAO,GAAK,IAAA,+BAAc,GAAE,QAArB,CAAqB;IAC5B,IAAA,IAAI,GAAc,KAAK,KAAnB,EAAK,IAAI,UAAK,KAAK,EAAzB,QAAiB,CAAF,CAAU;IAC/B,IAAM,SAAS,GAAG,IAAA,cAAM,EAAiB,IAAI,CAAC,CAAA;IAE9C,IAAA,iBAAS,EAAC;QACR,IAAI,CAAC,SAAS,CAAC,OAAO;YAAE,OAAM;QACxB,IAAA,KAAiC,SAAS,CAAC,OAAO,EAAhD,YAAY,kBAAA,EAAE,YAAY,kBAAsB,CAAA;QACxD,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,YAAY,GAAG,YAAY,EAAE,CAAC,CAAA;IAClE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAA;IAEV,OAAO,CACL,uBAAC,qBAAa,aAAC,KAAK,EAAE,UAAA,KAAK,IAAI,OAAA,uBAAM,KAAK,KAAE,OAAO,EAAE,wBAAgB,IAAG,EAAzC,CAAyC,gBACtE,yCAAK,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,IAAM,IAAI,cAC3C,0CAAK,GAAG,EAAE,gBAAgB,iBACxB,uBAAC,mCAAgB,KAAE,EAClB,OAAO,CAAC,GAAG,CAAC,UAAC,CAAC;wBACb,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;4BAAE,OAAO,IAAI,CAAA,CAAC,4BAA4B;wBAC1D,IAAM,GAAG,GAAG,CAAC,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,UAAG,CAAC,CAAC,MAAM,CAAC,EAAE,cAAI,CAAC,CAAC,gBAAgB,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAA;wBACnG,OAAO,uBAAC,aAAO,IAAW,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,EAAE,cAAc,IAA7D,GAAG,CAA6D,CAAA;oBACvF,CAAC,CAAC,EACF,uBAAC,iCAAe,KAAE,KACd,IACF,IACQ,CACjB,CAAA;AACH,CAAC,CAAA;AA3BY,QAAA,OAAO,WA2BnB;AAGD,IAAM,SAAS,OAAG,WAAG,ydAAA,qZAoBpB,IAAA,CAAA;AAED,IAAM,gBAAgB,OAAG,WAAG,8IAAA,0EAI3B,IAAA,CAAA;AAEY,QAAA,gBAAgB,GAAG,CAAC,mBAAa,MAAE,WAAG,oJAAA,gFAIlD,KAAC,CAAA;AAEF,IAAM,OAAO,OAAG,WAAG,oKAAA,gGAKlB,IAAA,CAAA;AAED,IAAM,cAAc,OAAG,WAAG,kIAAA,8DAGzB,IAAA,CAAA"}
|
|
@@ -48,7 +48,7 @@ var PlayerTimer_1 = require("../PlayerTimer");
|
|
|
48
48
|
var Counters_1 = require("./Counters");
|
|
49
49
|
var StyledPlayerPanel = function (props) {
|
|
50
50
|
var _a;
|
|
51
|
-
var player = props.player, activeRing = props.activeRing, timerOnRight = props.timerOnRight,
|
|
51
|
+
var player = props.player, activeRing = props.activeRing, timerOnRight = props.timerOnRight, playerFocus = props.playerFocus, backgroundImage = props.backgroundImage, _b = props.counters, counters = _b === void 0 ? [] : _b, _c = props.countersPerLine, countersPerLine = _c === void 0 ? 2 : _c, mainCounter = props.mainCounter, rest = __rest(props, ["player", "activeRing", "timerOnRight", "playerFocus", "backgroundImage", "counters", "countersPerLine", "mainCounter"]);
|
|
52
52
|
var allCounter = mainCounter ? __spreadArray([mainCounter], counters, true) : counters !== null && counters !== void 0 ? counters : [];
|
|
53
53
|
var setFocus = (0, material_1.useFocusContext)().setFocus;
|
|
54
54
|
var playerName = (0, hooks_1.usePlayerName)(player.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StyledPlayerPanel.js","sourceRoot":"","sources":["../../../src/components/PlayerPanel/StyledPlayerPanel.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAsC;AACtC,wCAAqE;AAGrE,+BAA0E;AAC1E,2CAAyC;AACzC,qCAAqD;AACrD,oCAA4E;AAC5E,wCAA4D;AAC5D,8CAAmE;AACnE,uCAAqC;
|
|
1
|
+
{"version":3,"file":"StyledPlayerPanel.js","sourceRoot":"","sources":["../../../src/components/PlayerPanel/StyledPlayerPanel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,12 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
+
};
|
|
13
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
17
|
exports.useFlatHistory = void 0;
|
|
18
|
+
var findLastIndex_1 = __importDefault(require("lodash/findLastIndex"));
|
|
15
19
|
var react_1 = require("react");
|
|
16
20
|
var react_redux_1 = require("react-redux");
|
|
17
21
|
var components_1 = require("../components");
|
|
@@ -25,37 +29,37 @@ var useFlatHistory = function () {
|
|
|
25
29
|
var setup = (_a = (0, react_redux_1.useSelector)(function (state) { return state.setup; })) !== null && _a !== void 0 ? _a : {};
|
|
26
30
|
var playedMoves = (0, react_redux_1.useSelector)(function (state) { return state.playedMoves; });
|
|
27
31
|
var gameOver = (0, react_redux_1.useSelector)(function (state) { return state.gameOver; });
|
|
28
|
-
var
|
|
32
|
+
var moves = (0, react_1.useRef)([]);
|
|
29
33
|
var rules = (0, react_1.useRef)();
|
|
30
34
|
(0, react_1.useEffect)(function () {
|
|
31
35
|
if (!rules.current && setup) {
|
|
32
36
|
rules.current = new context.Rules(JSON.parse(JSON.stringify(setup)), gameOver ? undefined : { player: player });
|
|
33
37
|
}
|
|
34
38
|
}, [setup, gameOver]);
|
|
35
|
-
var getMoveEntry = function (playedMove
|
|
39
|
+
var getMoveEntry = function (playedMove) {
|
|
36
40
|
var _a;
|
|
37
41
|
var move = playedMove.move;
|
|
38
|
-
var moveComponentContext = __assign(__assign({}, playedMove), { game: game });
|
|
42
|
+
var moveComponentContext = __assign(__assign({}, playedMove), { game: rules.current.game });
|
|
39
43
|
var description = (_a = context.logs) === null || _a === void 0 ? void 0 : _a.getMovePlayedLogDescription(move, moveComponentContext);
|
|
40
44
|
if (!(description === null || description === void 0 ? void 0 : description.Component))
|
|
41
45
|
return;
|
|
42
|
-
return __assign(__assign(__assign({}, playedMove), { game: JSON.parse(JSON.stringify(game)) }), description);
|
|
46
|
+
return __assign(__assign(__assign({}, playedMove), { game: JSON.parse(JSON.stringify(rules.current.game)) }), description);
|
|
43
47
|
};
|
|
44
48
|
(0, react_1.useEffect)(function () {
|
|
45
49
|
if (playedMoves !== undefined && !isLoaded)
|
|
46
50
|
setLoaded(true);
|
|
47
51
|
}, [playedMoves]);
|
|
48
52
|
(0, react_1.useEffect)(function () {
|
|
49
|
-
var _a
|
|
50
|
-
var actualSize = movesCount.current;
|
|
53
|
+
var _a;
|
|
51
54
|
if (!playedMoves)
|
|
52
55
|
return;
|
|
56
|
+
var actualSize = moves.current.length;
|
|
53
57
|
if (actualSize < playedMoves.length) {
|
|
54
58
|
var newMoves = playedMoves.slice(actualSize - playedMoves.length);
|
|
55
59
|
var entries_1 = [];
|
|
56
60
|
for (var _i = 0, newMoves_1 = newMoves; _i < newMoves_1.length; _i++) {
|
|
57
61
|
var move = newMoves_1[_i];
|
|
58
|
-
var entry = getMoveEntry(move
|
|
62
|
+
var entry = getMoveEntry(move);
|
|
59
63
|
if (entry)
|
|
60
64
|
entries_1.push(entry);
|
|
61
65
|
(_a = rules.current) === null || _a === void 0 ? void 0 : _a.play(move.move, { local: move.action.local });
|
|
@@ -63,22 +67,32 @@ var useFlatHistory = function () {
|
|
|
63
67
|
setHistory(function (h) { return h.concat(entries_1); });
|
|
64
68
|
}
|
|
65
69
|
else if (actualSize > playedMoves.length) {
|
|
66
|
-
var
|
|
67
|
-
var
|
|
68
|
-
var
|
|
69
|
-
|
|
70
|
-
var
|
|
70
|
+
var firstIndexChange = moves.current.findIndex(function (currentMove, index) { var _a; return currentMove.action.id !== ((_a = playedMoves[index]) === null || _a === void 0 ? void 0 : _a.action.id); });
|
|
71
|
+
var invalidatedMoves_1 = moves.current.slice(firstIndexChange);
|
|
72
|
+
var lastValidHistoryIndex_1 = (0, findLastIndex_1.default)(history, function (moveHistory) { return !invalidatedMoves_1.some(function (move) { return move.action.id === moveHistory.action.id; }); });
|
|
73
|
+
var lastValidHistory_1 = lastValidHistoryIndex_1 !== -1 ? history[lastValidHistoryIndex_1] : undefined;
|
|
74
|
+
var previousGameState = lastValidHistory_1 ? lastValidHistory_1.game : setup;
|
|
75
|
+
rules.current = new context.Rules(JSON.parse(JSON.stringify(previousGameState)));
|
|
76
|
+
var movesToReplay = lastValidHistory_1 ?
|
|
77
|
+
playedMoves.slice((0, findLastIndex_1.default)(playedMoves, function (move) {
|
|
78
|
+
return move.action.id === lastValidHistory_1.action.id && move.consequenceIndex === lastValidHistory_1.consequenceIndex;
|
|
79
|
+
}))
|
|
80
|
+
: playedMoves;
|
|
81
|
+
if (lastValidHistory_1) {
|
|
82
|
+
var move = movesToReplay.shift();
|
|
83
|
+
rules.current.play(move.move, { local: move.action.local });
|
|
84
|
+
}
|
|
71
85
|
var entries_2 = [];
|
|
72
|
-
for (var
|
|
73
|
-
var move =
|
|
74
|
-
var entry = getMoveEntry(move
|
|
86
|
+
for (var _b = 0, movesToReplay_1 = movesToReplay; _b < movesToReplay_1.length; _b++) {
|
|
87
|
+
var move = movesToReplay_1[_b];
|
|
88
|
+
var entry = getMoveEntry(move);
|
|
75
89
|
if (entry)
|
|
76
90
|
entries_2.push(entry);
|
|
77
|
-
|
|
91
|
+
rules.current.play(move.move, { local: move.action.local });
|
|
78
92
|
}
|
|
79
|
-
setHistory(function (h) { return h.slice(0,
|
|
93
|
+
setHistory(function (h) { return h.slice(0, lastValidHistoryIndex_1 + 1).concat(entries_2); });
|
|
80
94
|
}
|
|
81
|
-
|
|
95
|
+
moves.current = playedMoves;
|
|
82
96
|
}, [playedMoves]);
|
|
83
97
|
return {
|
|
84
98
|
history: history,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFlatHistory.js","sourceRoot":"","sources":["../../src/hooks/useFlatHistory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useFlatHistory.js","sourceRoot":"","sources":["../../src/hooks/useFlatHistory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gamepark/react-game",
|
|
3
|
-
"version": "6.31.
|
|
3
|
+
"version": "6.31.4",
|
|
4
4
|
"description": "React components & tools to create a Board Game user interface for Game Park",
|
|
5
5
|
"author": "Romain Fromi <romain@game-park.com> (https://game-park.com/)",
|
|
6
6
|
"license": "ISC",
|