Skip to content
Merged
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
22 changes: 16 additions & 6 deletions src/compiler/declarations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,17 @@ function parseLetterSpacing(
if (value.type === "normal") {
return;
}
return parseLength(value.value, builder);
const descriptor = parseLength(value.value, builder);

if (
Array.isArray(descriptor) &&
descriptor[1] === "em" &&
typeof descriptor[2] === "number"
) {
return descriptor[2];
}

return descriptor;
}

function parseTextDecoration(
Expand Down Expand Up @@ -1166,7 +1176,7 @@ export function parseLength(
const { inlineRem = 14 } = builder.getOptions();

if (typeof length === "number") {
return length;
return round(length);
}

if ("unit" in length) {
Expand All @@ -1177,19 +1187,19 @@ export function parseLength(
} else if (length.value === -Infinity) {
return -9999;
} else {
return length.value;
return round(length.value);
}
}
case "rem":
if (typeof inlineRem === "number") {
return length.value * inlineRem;
} else {
return [{}, "rem", length.value];
return [{}, "rem", round(length.value)];
}
case "vw":
case "vh":
case "em":
return [{}, length.unit, length.value, 1];
return [{}, length.unit, round(length.value), 1];
case "in":
case "cm":
case "mm":
Expand Down Expand Up @@ -2288,7 +2298,7 @@ export function parseSVGPaint(
}

export function round(number: number) {
return Math.round((number + Number.EPSILON) * 100) / 100;
return Math.round((number + Number.EPSILON) * 10000) / 10000;
}

export function parseDimensionPercentageFor_LengthValue(
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/native/conditions/media-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function testComparison(mediaQuery: MediaCondition, get: Getter): Boolean {

switch (mediaQuery[1]) {
case "platform":
return right === Platform.OS;
return right === "native" || right === Platform.OS;
case "prefers-color-scheme": {
return right === get(colorScheme);
}
Expand Down
10 changes: 7 additions & 3 deletions src/runtime/native/styles/units.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@
import { rem as remObs, vh as vhObs, vw as vwObs } from "../reactivity";
import type { StyleFunctionResolver } from "./resolve";

export const em: StyleFunctionResolver = (resolve, func) => {
export const em: StyleFunctionResolver = (resolve, func, get) => {
let value = func[2];

if (!value) {
return;
}

const emValue = resolve([{}, "var", ["__rn-css-em"]]);
let emValue = resolve([{}, "var", ["__rn-css-em"]]);

if (typeof emValue !== "number") {
return undefined;
emValue = get(remObs);
}

if (typeof emValue !== "number") {
return;
}

return round(Number(value) * emValue);
Expand Down