Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/components/composer/composer/abstract_composer_store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -535,11 +535,14 @@ export abstract class AbstractComposerStore extends SpreadsheetStore {
if (isNewCurrentContent || this.editionMode !== "inactive") {
const locale = this.getters.getLocale();
this.currentTokens = isFormula(text) ? composerTokenize(text, locale) : [];
if (this.currentTokens.length > 100) {
const nonSpaceTokensCount = this.currentTokens.filter(
(token) => token.type !== "SPACE"
).length;
if (nonSpaceTokensCount > 1000) {
if (raise) {
this.notificationStore.raiseError(
_t(
"This formula has over 100 parts. It can't be processed properly, consider splitting it into multiple cells"
"This formula has over 1000 parts. It can't be processed properly, consider splitting it into multiple cells"
)
);
}
Expand Down
7 changes: 6 additions & 1 deletion src/components/composer/composer/cell_composer_store.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { prettify } from "../../../formulas/formula_formatter";
import { parseTokens } from "../../../formulas/parser";
import { isMultipleElementMatrix, toScalar } from "../../../functions/helper_matrices";
import { parseLiteral } from "../../../helpers/cells";
import {
Expand Down Expand Up @@ -202,7 +204,10 @@ export class CellComposerStore extends AbstractComposerStore {
const locale = this.getters.getLocale();
const cell = this.getters.getCell(position);
if (cell?.isFormula) {
return localizeFormula(cell.content, locale);
const prettifiedContent = cell.compiledFormula.isBadExpression
? cell.content
: prettify(parseTokens(cell.compiledFormula.tokens), 80);
return localizeFormula(prettifiedContent, locale);
}
const spreader = this.model.getters.getArrayFormulaSpreadingOn(position);
if (spreader) {
Expand Down
2 changes: 2 additions & 0 deletions src/components/composer/composer/composer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ css/* scss */ `
padding-right: 3px;
outline: none;

tab-size: 4;

p {
margin-bottom: 0px;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { CellComposerStore } from "../composer/cell_composer_store";
import { Composer } from "../composer/composer";
import { ComposerFocusStore, ComposerInterface } from "../composer_focus_store";

const COMPOSER_MAX_HEIGHT = 100;
const COMPOSER_MAX_HEIGHT = 300;

/* svg free of use from https://uxwing.com/formula-fx-icon/ */
const FX_SVG = /*xml*/ `
Expand Down
1 change: 0 additions & 1 deletion src/components/spreadsheet/spreadsheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ css/* scss */ `
}
}

.o-spreadsheet-topbar-wrapper,
.o-spreadsheet-bottombar-wrapper {
z-index: ${ComponentsImportance.ScrollBar + 1};
}
Expand Down
Loading