Skip to content

[REF] format: move format from cell to style plugin #7327

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[REF] format: move format from cell to style plugin #7327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 11 additions & 24 deletions packages/o-spreadsheet-engine/src/helpers/cells/cell_evaluation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { isEvaluationError, toString } from "../../functions/helpers";
import {
BooleanCell,
Cell,
CellValue,
CellValueType,
EmptyCell,
Expand All @@ -14,13 +13,7 @@ import { LocaleFormat } from "../../types/format";
import { DEFAULT_LOCALE, Locale } from "../../types/locale";
import { CellPosition, FunctionResultObject } from "../../types/misc";
import { parseDateTime } from "../dates";
import {
detectDateFormat,
detectNumberFormat,
formatValue,
isDateTimeFormat,
isTextFormat,
} from "../format/format";
import { formatValue, isDateTimeFormat, isTextFormat } from "../format/format";
import { detectLink } from "../links";
import { isBoolean, memoize } from "../misc";
import { isNumber, parseNumber } from "../numbers";
Expand All @@ -35,7 +28,7 @@ export function evaluateLiteral(
? literalCell.content
: literalCell.parsedValue;
const functionResult = { value, format: localeFormat.format, origin: position };
return createEvaluatedCell(functionResult, localeFormat.locale);
return createEvaluatedCell(functionResult, localeFormat);
}

export function parseLiteral(content: string, locale: Locale): CellValue {
Expand Down Expand Up @@ -66,28 +59,22 @@ export function parseLiteral(content: string, locale: Locale): CellValue {

export function createEvaluatedCell(
functionResult: FunctionResultObject,
locale: Locale = DEFAULT_LOCALE,
cell?: Cell,
locale: LocaleFormat = { locale: DEFAULT_LOCALE },
origin?: CellPosition
): EvaluatedCell {
const link = detectLink(functionResult.value);
if (!link) {
const evaluateCell = _createEvaluatedCell(functionResult, locale, cell);
const evaluateCell = _createEvaluatedCell(functionResult, locale);
return addOrigin(evaluateCell, functionResult.origin ?? origin);
}
const value = parseLiteral(link.label, locale);
const format =
functionResult.format ||
(typeof value === "number"
? detectDateFormat(link.label, locale) || detectNumberFormat(link.label)
: undefined);
const value = parseLiteral(link.label, locale.locale);
const linkPayload = {
value,
format,
format: locale.format,
};
return addOrigin(
{
..._createEvaluatedCell(linkPayload, locale, cell),
..._createEvaluatedCell(linkPayload, locale),
link,
},
functionResult.origin ?? origin
Expand All @@ -96,11 +83,11 @@ export function createEvaluatedCell(

function _createEvaluatedCell(
functionResult: FunctionResultObject,
locale: Locale,
cell?: Cell
localeFormat: LocaleFormat
): EvaluatedCell {
let { value, format, message } = functionResult;
format = cell?.format || format;
format = localeFormat.format || format;
const locale = localeFormat.locale;

const formattedValue = formatValue(value, { format, locale });
if (isEvaluationError(value)) {
Expand Down Expand Up @@ -155,7 +142,7 @@ function numberCell(value: number, format: string | undefined, formattedValue: s
};
}

const emptyCell = memoize(function emptyCell(format: string | undefined): EmptyCell {
export const emptyCell = memoize(function emptyCell(format: string | undefined): EmptyCell {
return {
value: null,
format,
Expand Down
Loading