fix: Avoid hardcoded CSS constants

This commit is contained in:
James Rupert Tan 2024-06-07 12:55:16 -05:00
parent bd7c35e7fb
commit d7b7b5ba1e
2 changed files with 25 additions and 37 deletions

View file

@ -319,7 +319,6 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
renderNameAsMarkdown(nameField.label, getFile, component); renderNameAsMarkdown(nameField.label, getFile, component);
if (entry.subEntries?.length) {
let expandButton = new ButtonComponent(nameField.label) let expandButton = new ButtonComponent(nameField.label)
.setClass("clickable-icon") .setClass("clickable-icon")
.setClass("simple-time-tracker-expand-button") .setClass("simple-time-tracker-expand-button")
@ -333,12 +332,12 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
} }
await saveTracker(tracker, this.app, getFile(), getSectionInfo()); await saveTracker(tracker, this.app, getFile(), getSectionInfo());
}); });
if (!entry.subEntries?.length) expandButton.buttonEl.style.visibility = 'hidden';
let nameWrapper = nameField.cell.createDiv({cls: "simple-time-tracker-table-expandwrapper"}); let nameWrapper = nameField.cell.createDiv({cls: "simple-time-tracker-table-expandwrapper"});
nameWrapper.style.marginLeft = nameField.label.style.marginLeft; nameWrapper.style.marginLeft = nameField.label.style.marginLeft;
nameField.label.style.marginLeft = null; nameField.label.style.marginLeft = null;
nameWrapper.insertBefore(nameField.label, null);
nameWrapper.insertBefore(expandButton.buttonEl, null); nameWrapper.insertBefore(expandButton.buttonEl, null);
} nameWrapper.insertBefore(nameField.label, null);
let entryButtons = row.createEl("td"); let entryButtons = row.createEl("td");
entryButtons.addClass("simple-time-tracker-table-buttons"); entryButtons.addClass("simple-time-tracker-table-buttons");
@ -358,6 +357,9 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
.onClick(async () => { .onClick(async () => {
if (nameField.editing()) { if (nameField.editing()) {
entry.name = nameField.endEdit(); entry.name = nameField.endEdit();
if (entry.subEntries?.length) {
expandButton.buttonEl.style.display = null;
}
startField.endEdit(); startField.endEdit();
entry.startTime = startField.getTimestamp(); entry.startTime = startField.getTimestamp();
if (!entryRunning) { if (!entryRunning) {
@ -370,6 +372,9 @@ function addEditableTableRow(tracker: Tracker, entry: Entry, table: HTMLTableEle
renderNameAsMarkdown(nameField.label, getFile, component); renderNameAsMarkdown(nameField.label, getFile, component);
} else { } else {
nameField.beginEdit(entry.name); nameField.beginEdit(entry.name);
if (entry.subEntries?.length) {
expandButton.buttonEl.style.display = 'none';
}
// only allow editing start and end times if we don't have sub entries // only allow editing start and end times if we don't have sub entries
if (!entry.subEntries) { if (!entry.subEntries) {
startField.beginEdit(entry.startTime); startField.beginEdit(entry.startTime);

View file

@ -79,20 +79,3 @@
.simple-time-tracker-table tr:hover { .simple-time-tracker-table tr:hover {
background-color: var(--background-modifier-hover); background-color: var(--background-modifier-hover);
} }
.simple-time-tracker-table :is(td,th):first-child {
/* HACKY hardcoded 2em to make room for expand/collapse button */
padding-left: 2em;
}
.simple-time-tracker-table-expandwrapper {
position: relative;
}
.simple-time-tracker-expand-button {
position: absolute;
/* HACKY there should be a better way to position this */
left: 0;
top: 50%;
transform: translate(-100%, -50%);
}