Remove unneded upstream features
CI / check (push) Has been cancelled

This commit is contained in:
2026-07-25 15:38:41 +02:00
parent 62d6bd211b
commit b35c88b451
4 changed files with 41 additions and 59 deletions
+2 -22
View File
@@ -20,7 +20,7 @@ import { Weapons, hasDifferentProfiles } from "./Weapons";
import { useIndexedDB } from "../helpers/useIndexedDB"; // New hook for IndexedDB
import { ImgEditor } from "./ImgEditor";
import { trySettingLocalStorage } from "../helpers/useLocalStorage";
import { ShortSummaryTable } from "./ShortSummaryTable";
import { HIDE_UNIT_COMPOSITION, ShortSummaryTable } from "../fork";
const getShortSummarySubtitle = (force) => {
const details = [];
@@ -183,7 +183,7 @@ const Force = ({ force, onePerPage, colorUserChoice }) => {
const Unit = ({ unit, catalog, onePerPage, forceRules, colorUserChoice }) => {
const [hide, setHide] = useState(false);
const [hideModelCount, setHideModelCount] = useState(false);
const hideModelCount = HIDE_UNIT_COMPOSITION;
const uploadRef = useRef();
let {
name,
@@ -315,23 +315,6 @@ const Unit = ({ unit, catalog, onePerPage, forceRules, colorUserChoice }) => {
}}
>
<div className="flex justify-end gap-3 pb-0.5">
<label
className="print-display-none"
style={{
display: "flex",
alignItems: "center",
justifyContent: "flex-end",
gap: 4,
userSelect: "none",
}}
>
<input
className="hide-model-selection"
type="checkbox"
onChange={(e) => setHideModelCount(e.target.checked)}
/>
<span className="print-display-none">Hide Unit Composition</span>
</label>
<label
className="print-display-none"
style={{
@@ -424,9 +407,6 @@ const Unit = ({ unit, catalog, onePerPage, forceRules, colorUserChoice }) => {
}}
>
{name}
<span style={{ textTransform: "initial", fontSize: "1.2rem" }}>
{cost.points}pts
</span>
</div>
<div className="relative flex gap-4">
<div
-36
View File
@@ -86,24 +86,12 @@ function App() {
const [onePerPage, setOnePerPage] = useState(false);
const [primaryColor, setPrimaryColor] = useState("#536766");
const [colorUserChoice, setColorUserChoice] = useState(false);
const [hideModelSelections, setHideModelSelections] = useState(false);
const uploadRef = useRef();
const throttledSetPrimaryColor = useRef(
throttle((color) => setPrimaryColor(color), 50),
).current;
const toggleHideModelSelections = (hide) => {
const checkboxes = document.querySelectorAll(
'input[type="checkbox"].hide-model-selection',
);
checkboxes.forEach((checkbox) => {
if (checkbox.checked !== hide) {
checkbox.click();
}
});
};
async function handleFileSelect(event) {
const files = event?.target?.files;
@@ -431,30 +419,6 @@ function App() {
One Datacard per Page when Printing
</span>
</label>
{
// only show when 10th or 11th edition
(edition === 10 || edition === 11) && (
<label
style={{
display: "flex",
alignItems: "center",
gap: 4,
minHeight: 26,
}}
>
<input
type="checkbox"
value={hideModelSelections}
onChange={(e) => {
setHideModelSelections(e.target.checked);
toggleHideModelSelections(e.target.checked);
}}
className="hide-model-selection"
/>
<span className="select-none">Hide all Unit Compositions</span>
</label>
)
}
<div style={{ display: "flex", alignItems: "center", gap: 4 }}>
<label style={{ display: "flex", alignItems: "center", gap: 4 }}>
<input
+23
View File
@@ -0,0 +1,23 @@
// Fork-local display decisions.
//
// BrevyScribe prints the generic datasheet for a unit rather than a record of
// one particular list, so a few of the things FancyScribe shows have nothing
// left to say here. They are switched off from this file - which upstream does
// not have, and which therefore can never conflict - so that the components
// upstream owns are touched on as few lines as possible.
// The roster overview table summarises the list that was uploaded: its total
// cost, a unit-by-unit breakdown and the charts drawn from them. None of that
// survives the transforms, so the card is not rendered at all.
//
// 10th/Roster.jsx imports this in place of ./ShortSummaryTable, which leaves the
// render site there byte-identical to upstream. ShortSummaryTable.jsx itself is
// kept in the tree, unused, so upstream changes to it keep merging cleanly (Vite
// tree-shakes it, and chart.js with it, out of the build).
export const ShortSummaryTable = () => null;
// The unit composition lists the models this particular list took, which is the
// list-specific detail the fork exists to strip - and after duplicate units are
// merged into one card it is misleading as well. It is always hidden, and the
// checkboxes that used to toggle it are gone.
export const HIDE_UNIT_COMPOSITION = true;