obsidian-plugin/silvanocerza_github-gitless-sync
1
0
Fork 0
mirror of https://github.com/silvanocerza/github-gitless-sync.git synced 2026-07-22 12:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue when rerendering conflict view

Browse source
This commit is contained in:
Silvano Cerza 2025-02-25 18:50:12 +01:00
parent 2d8ee9f7bd
commit a1fea0cb95
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/views/conflicts-resolution/view.tsx
View file

@ -10,6 +10,7 @@ export const CONFLICTS_RESOLUTION_VIEW_TYPE = "conflicts-resolution-view";
export class ConflictsResolutionView extends ItemView {
icon: IconName = "merge";
private root: Root | null = null;
constructor(
leaf: WorkspaceLeaf,
@ -44,11 +45,13 @@ export class ConflictsResolutionView extends ItemView {
}
private render(conflicts: ConflictFile[]) {
const container = this.containerEl.children[1];
container.empty();
// We don't want any padding, the DiffView component will handle that
(container as HTMLElement).style.padding = "0";
const root: Root = createRoot(container);
if (!this.root) {
const container = this.containerEl.children[1];
container.empty();
// We don't want any padding, the DiffView component will handle that
(container as HTMLElement).style.padding = "0";
this.root = createRoot(container);
}
const App = ({ initialFiles }: { initialFiles: ConflictFile[] }) => {
const [files, setFiles] = React.useState(initialFiles);
const [resolvedConflicts, setResolvedConflicts] = React.useState<
@ -149,7 +152,7 @@ export class ConflictsResolutionView extends ItemView {
</React.StrictMode>
);
};
root.render(<App initialFiles={conflicts} />);
this.root.render(<App initialFiles={conflicts} />);
}
async onClose() {