Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][FIX] cell: keep non-breaking spaces #5365

Closed
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
15 changes: 8 additions & 7 deletions src/formulas/tokenizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import {
TokenizingChars,
getFormulaNumberRegex,
rangeReference,
replaceSpecialSpaces,
replaceNewLines,
whiteSpaceRegexp,
} from "../helpers/index";
import { DEFAULT_LOCALE, Locale } from "../types";
import { CellErrorType } from "../types/errors";
Expand Down Expand Up @@ -48,7 +49,7 @@ export interface Token {
}

export function tokenize(str: string, locale = DEFAULT_LOCALE): Token[] {
str = replaceSpecialSpaces(str);
str = replaceNewLines(str);
const chars = new TokenizingChars(str);
const result: Token[] = [];

Expand Down Expand Up @@ -214,13 +215,13 @@ function tokenizeSpace(chars: TokenizingChars): Token | null {
return { type: "SPACE", value: NEWLINE.repeat(length) };
}

while (chars.current === " ") {
length++;
chars.shift();
let spaces = "";
while (chars.current && chars.current.match(whiteSpaceRegexp)) {
spaces += chars.shift();
}

if (length) {
return { type: "SPACE", value: " ".repeat(length) };
if (spaces) {
return { type: "SPACE", value: spaces };
}
return null;
}
Expand Down
12 changes: 6 additions & 6 deletions src/helpers/misc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ export function removeFalsyAttributes<T extends Object | undefined | null>(obj:
* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
*/
const whiteSpaceSpecialCharacters = [
" ",
"\t",
"\f",
"\v",
Expand All @@ -458,16 +459,15 @@ const whiteSpaceSpecialCharacters = [
String.fromCharCode(parseInt("3000", 16)),
String.fromCharCode(parseInt("feff", 16)),
];
const whiteSpaceRegexp = new RegExp(whiteSpaceSpecialCharacters.join("|") + "|(\r\n|\r|\n)", "g");
export const whiteSpaceRegexp = new RegExp(whiteSpaceSpecialCharacters.join("|"), "g");
const newLineRegexp = /(\r\n|\r)/g;

/**
* Replace all the special spaces in a string (non-breaking, tabs, ...) by normal spaces, and all the
* different newlines types by \n.
* Replace all different newlines characters by \n
*/
export function replaceSpecialSpaces(text: string | undefined): string {
export function replaceNewLines(text: string | undefined): string {
if (!text) return "";
if (!whiteSpaceRegexp.test(text)) return text;
return text.replace(whiteSpaceRegexp, (match, newLine) => (newLine ? NEWLINE : " "));
return text.replace(newLineRegexp, NEWLINE);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/core/cell.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
detectNumberFormat,
isInside,
range,
replaceSpecialSpaces,
replaceNewLines,
toCartesian,
toXC,
} from "../../helpers/index";
Expand Down Expand Up @@ -564,7 +564,7 @@ export class CellPlugin extends CorePlugin<CoreState> implements CoreState {
const hasContent = "content" in after || "formula" in after;

// Compute the new cell properties
const afterContent = hasContent ? replaceSpecialSpaces(after?.content) : before?.content || "";
const afterContent = hasContent ? replaceNewLines(after?.content) : before?.content || "";
let style: Style | undefined;
if (after.style !== undefined) {
style = after.style || undefined;
Expand Down
7 changes: 6 additions & 1 deletion tests/cells/cell_plugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,12 @@ describe("getCellText", () => {
setCellContent(model, "A1", '="hello \\"world\\""');
expect(getEvaluatedCell(model, "A1")?.formattedValue).toBe('hello "world"');
});

test("Non breaking spaces are kept on cell insertion", () => {
const model = new Model();
setCellContent(model, "A1", "hello\u00A0world");
expect(getCellText(model, "A1")).toBe("hello\u00A0world");
});
});

describe("link cell", () => {
Expand Down Expand Up @@ -549,7 +555,6 @@ test.each([
["Line\nLine2", "Line\nLine2"],
["Line\rLine2", "Line\nLine2"],
["Line\r\nLine2", "Line\nLine2"],
["Word\xa0Word2", "Word Word2"], // \xa0 => non-breaking space
])(
"Content string given to update cell are properly sanitized %s",
(originalString: string, sanitizedString: string) => {
Expand Down
2 changes: 1 addition & 1 deletion tests/evaluation/tokenizer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ describe("tokenizer", () => {

test("spaces", () => {
expect(tokenize(" ")).toEqual([{ type: "SPACE", value: " ".repeat(2) }]);
expect(tokenize(" \t\v\f")).toEqual([{ type: "SPACE", value: " ".repeat(4) }]);
expect(tokenize(" \t\v\f")).toEqual([{ type: "SPACE", value: " \t\v\f" }]);
expect(tokenize("= 50 %")).toEqual([
{ type: "OPERATOR", value: "=" },
{ type: "SPACE", value: " " },
Expand Down