Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Changes

Stanimir2d3ccee1fe8d
diff --cc app/components/EditDescription.tsx
index bc5829b2f,1d19b571a..157dbf5eb
--- a/app/components/EditDescription.tsx
+++ b/app/components/EditDescription.tsx
@@@ -122,7 -180,7 +180,7 @@@ function EditDescription(props: Props)
{i18n.t('core:addMarkdownDescription')}
</Typography>
) : (
-- <div style={{ padding: editMode ? 0 : 5 }}>
++ <>
<style>
{`
.prose a {
@@@ -143,21 -201,10 +201,10 @@@
excludePlugins={!editMode ? ['menu', 'upload'] : []}
currentFolder={currentFolder}
/>
-- </div>
++ </>
)}
</div>
- <Typography
- variant="caption"
- style={{
- color: primaryColor
- }}
- >
- Markdown help: <i className={classes.mdHelpers}>_italic_</i>{' '}
- <b className={classes.mdHelpers}>**bold**</b>{' '}
- <span className={classes.mdHelpers}>* list item</span>{' '}
- <span className={classes.mdHelpers}>[Link text](http://...)</span>
- </Typography>
- </>
+ </Root>
);
}
diff --cc app/components/EntryContainer.tsx
index 5d4e8f188,749e6202f..baaf04a7d
--- a/app/components/EntryContainer.tsx
+++ b/app/components/EntryContainer.tsx
@@@ -1575,27 -1169,41 +1171,40 @@@ function EntryContainer(props: Props)
initSize = openedFile.isFile ? settings.entrySplitSize : '100%';
} else {
initSize = defaultSplitSize; // '0%';
- }
+ }*/
return (
- <Split
- horizontal
- minPrimarySize="98px"
- initialPrimarySize={initSize}
- percent={percent.current}
- setPercent={setPercent}
+ <div
+ style={{
+ height: 'calc(100% - 47px)',
+ //height: '100%',
+ //minHeight: '100%',
+ ...propertiesStyles
+ }}
>
- <Root>{toolbarButtons()}</Root>
- <FileView
- key="FileViewID"
- openedFile={openedFiles[0]}
- isFullscreen={isFullscreen}
- fileViewer={fileViewer}
- fileViewerContainer={fileViewerContainer}
- toggleFullScreen={toggleFullScreen}
- eventID={eventID.current}
- />
- </Split>
+ <Root>
+ {openedFile.path !== undefined ? (
+ <>
+ {toolbarButtons()}
+ {tabs()}
+ </>
+ ) : (
+ <div>{i18n.t('core:noEntrySelected')}</div>
+ )}
+ </Root>
+ {openedFile.isFile && (
+ <FileView
+ key="FileViewID"
+ openedFile={openedFile}
+ isFullscreen={isFullscreen}
+ fileViewer={fileViewer}
+ fileViewerContainer={fileViewerContainer}
+ toggleFullScreen={toggleFullScreen}
- currentTheme={settings.currentTheme}
+ eventID={eventID.current}
+ height={propertiesStyles ? '100%' : 'calc(100% - 100px)'}
+ />
+ )}
+ </div>
);
};
diff --cc app/components/FileView.tsx
index ad4160e81,4055117f5..c932f6565
--- a/app/components/FileView.tsx
+++ b/app/components/FileView.tsx
@@@ -99,7 -99,7 +99,11 @@@ function FileView(props: Props)
: '';
const locale = '&locale=' + i18n.language;
const theming =
- '&theme=' + theme.palette.mode + extPrimaryColor + extTextColor + extBgndColor;
- '&theme=' + currentTheme + extPrimaryColor + extTextColor + extBgndColor;
++ '&theme=' +
++ theme.palette.mode +
++ extPrimaryColor +
++ extTextColor +
++ extBgndColor;
if (openedFile.editMode && openedFile.editingExtensionPath) {
fileOpenerURL =
diff --cc package-lock.json
index 1b549e64c,1b549e64c..9914dd9a6
--- a/package-lock.json
+++ b/package-lock.json
@@@ -19,7 -19,7 +19,7 @@@
"@mui/lab": "^5.0.0-alpha.135",
"@mui/material": "^5.13.7",
"@mui/x-date-pickers": "^5.0.20",
-- "@tagspaces/tagspaces-md": "3.0.13",
++ "@tagspaces/tagspaces-md": "3.0.15",
"@tagspaces/tagspaces-platforms": "2.1.56",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
@@@ -12411,9 -12411,9 +12411,9 @@@
}
},
"node_modules/@tagspaces/tagspaces-md": {
-- "version": "3.0.13",
-- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-md/-/tagspaces-md-3.0.13.tgz",
-- "integrity": "sha512-TADvKx16R4E+5WEg02kra1HYcGUNnAH6kX10PfHl/fQBEyrF1mxO71sUZjWICUT9nbsdLVZ/yK7XNGTUTFLmmQ==",
++ "version": "3.0.15",
++ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-md/-/tagspaces-md-3.0.15.tgz",
++ "integrity": "sha512-kwfF2e2YmxObyP/vj4vURWj/d3QlXXjZnqZtRR71Z4dLlrd1/ggTcGY14ozOL3aiXbCanyTVwXjbPWm/XpY/pA==",
"dependencies": {
"@milkdown/core": "7.2.4",
"@milkdown/ctx": "7.2.4",
@@@ -52744,9 -52744,9 +52744,9 @@@
}
},
"@tagspaces/tagspaces-md": {
-- "version": "3.0.13",
-- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-md/-/tagspaces-md-3.0.13.tgz",
-- "integrity": "sha512-TADvKx16R4E+5WEg02kra1HYcGUNnAH6kX10PfHl/fQBEyrF1mxO71sUZjWICUT9nbsdLVZ/yK7XNGTUTFLmmQ==",
++ "version": "3.0.15",
++ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-md/-/tagspaces-md-3.0.15.tgz",
++ "integrity": "sha512-kwfF2e2YmxObyP/vj4vURWj/d3QlXXjZnqZtRR71Z4dLlrd1/ggTcGY14ozOL3aiXbCanyTVwXjbPWm/XpY/pA==",
"requires": {
"@milkdown/core": "7.2.4",
"@milkdown/ctx": "7.2.4",
diff --cc package.json
index 6e240f2ce,6e240f2ce..b0aa37e85
--- a/package.json
+++ b/package.json
@@@ -148,7 -148,7 +148,7 @@@
"@mui/lab": "^5.0.0-alpha.135",
"@mui/material": "^5.13.7",
"@mui/x-date-pickers": "^5.0.20",
-- "@tagspaces/tagspaces-md": "3.0.13",
++ "@tagspaces/tagspaces-md": "3.0.15",
"@tagspaces/tagspaces-platforms": "2.1.56",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",