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
5 changes: 5 additions & 0 deletions .changeset/red-pears-kiss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lynx-js/web-core": patch
---

fix: transformVH not work with cqw unit as the base length
Comment thread
PupilTong marked this conversation as resolved.
5 changes: 5 additions & 0 deletions .changeset/warm-zoos-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@lynx-js/web-core": patch
---

fix: the default value of rpx is supposed to be 1/750 cqw
20 changes: 20 additions & 0 deletions packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
ReturnType<typeof expect<Page>>['toHaveScreenshot']
>[0],
) => {
await expect(page).toHaveScreenshot([

Check failure on line 24 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (2/2) / check

[firefox] › tests/reactlynx.spec.ts:1797:7 › reactlynx3 tests › apis › api-exposure › api-exposure-dynamic-ui-margin

8) [firefox] › tests/reactlynx.spec.ts:1797:7 › reactlynx3 tests › apis › api-exposure › api-exposure-dynamic-ui-margin Error: expect(page).toHaveScreenshot(expected) failed 159353 pixels (ratio 0.18 of all image pixels) are different. Snapshot: exposure/api-exposure-dynamic-ui-margin/1-orange-half-do-trigger.png Call log: - Expect "toHaveScreenshot(exposure/api-exposure-dynamic-ui-margin/1-orange-half-do-trigger.png)" with timeout 5000ms - verifying given screenshot expectation - taking page screenshot - waiting for fonts to load... - fonts loaded - 159353 pixels (ratio 0.18 of all image pixels) are different. - waiting 100ms before taking screenshot - taking page screenshot - waiting for fonts to load... - fonts loaded - captured a stable screenshot - 159353 pixels (ratio 0.18 of all image pixels) are different. 22 | >[0], 23 | ) => { > 24 | await expect(page).toHaveScreenshot([ | ^ 25 | `${caseName}`, 26 | `${subcaseName}`, 27 | `${label}.png`, at diffScreenShot (/__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:24:22) at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:1809:15

Check failure on line 24 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (2/2) / check

[chromium] › tests/reactlynx.spec.ts:3025:7 › reactlynx3 tests › elements › x-viewpager-ng › basic-element-x-viewpager-ng-exposure

6) [chromium] › tests/reactlynx.spec.ts:3025:7 › reactlynx3 tests › elements › x-viewpager-ng › basic-element-x-viewpager-ng-exposure Error: expect(page).toHaveScreenshot(expected) failed 7138 pixels (ratio 0.03 of all image pixels) are different. Snapshot: x-viewpager-ng/basic-element-x-viewpager-ng-exposure/exposure-1.png Call log: - Expect "toHaveScreenshot(x-viewpager-ng/basic-element-x-viewpager-ng-exposure/exposure-1.png)" with timeout 5000ms - verifying given screenshot expectation - taking page screenshot - waiting for fonts to load... - fonts loaded - 7138 pixels (ratio 0.03 of all image pixels) are different. - waiting 100ms before taking screenshot - taking page screenshot - waiting for fonts to load... - fonts loaded - captured a stable screenshot - 7138 pixels (ratio 0.03 of all image pixels) are different. 22 | >[0], 23 | ) => { > 24 | await expect(page).toHaveScreenshot([ | ^ 25 | `${caseName}`, 26 | `${subcaseName}`, 27 | `${label}.png`, at diffScreenShot (/__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:24:22) at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:3042:17
`${caseName}`,
`${subcaseName}`,
`${label}.png`,
Expand Down Expand Up @@ -394,6 +394,7 @@
const lynxView = await page.locator('lynx-view');
await lynxView.evaluate((node) => {
node.style.width = '50px';
node.style.setProperty('--rpx-unit', '1cqw');
});
const target = await page.locator('#target');
await expect(target).toHaveCSS('height', '10px'); // 20cqw, 50 / 100 * 20 = 10px
Expand All @@ -406,6 +407,7 @@
const lynxView = await page.locator('lynx-view');
await lynxView.evaluate((node) => {
node.style.width = '50px';
node.style.setProperty('--rpx-unit', '1cqw');
});
const target = await page.locator('#target');
await expect(target).toHaveCSS('height', '10px'); // 20cqw, 50 / 100 * 20 = 10px
Expand Down Expand Up @@ -450,7 +452,25 @@
await wait(500); // Wait for the reload to rebuild the CSS properly
await expect(target).not.toHaveCSS('width', '25px');
await expect(target).not.toHaveCSS('height', '50px');

// now make sure the cqw/cqh work
await lynxView.evaluate((node: any) => {
node.transformVW = true;
node.transformVH = true;
node.style.height = '500px';
node.style.width = '500px';
node.style.minHeight = '500px';
node.style.minWidth = '500px';
Comment thread
coderabbitai[bot] marked this conversation as resolved.
node.style.setProperty('--vh-unit', '1cqh');
node.style.setProperty('--vw-unit', '1cqw');
node.reload();
});
await wait(500); // Wait for the reload to rebuild the CSS properly

await expect(target).toHaveCSS('width', '250px');
await expect(target).toHaveCSS('height', '250px');
});

test('basic-image', async ({ page }, { title }) => {
await goto(page, title);
await wait(100);
Expand Down Expand Up @@ -1382,7 +1402,7 @@
document.querySelector('lynx-view')!.remove();
});
await wait(50);
expect(message).toContain('fin');

Check failure on line 1405 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (1/2) / check

[chromium] › tests/reactlynx.spec.ts:1392:5 › reactlynx3 tests › apis › api-dispose

9) [chromium] › tests/reactlynx.spec.ts:1392:5 › reactlynx3 tests › apis › api-dispose ─────────── Error: expect(received).toContain(expected) // indexOf Expected value: "fin" Received array: [] 1403 | }); 1404 | await wait(50); > 1405 | expect(message).toContain('fin'); | ^ 1406 | expect(currentWorkerCount - page.workers().length).toStrictEqual(1); 1407 | }); 1408 | at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:1405:23
expect(currentWorkerCount - page.workers().length).toStrictEqual(1);
});

Expand Down Expand Up @@ -1870,7 +1890,7 @@
.sendGlobalEvent('event-test', ['change']);
});
await wait(200);
await expect(target).toHaveCSS(

Check failure on line 1893 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (1/2) / check

[webkit] › tests/reactlynx.spec.ts:1883:5 › reactlynx3 tests › apis › api-sendGlobalEvent

2) [webkit] › tests/reactlynx.spec.ts:1883:5 › reactlynx3 tests › apis › api-sendGlobalEvent ───── Error: expect(locator).toHaveCSS(expected) failed Locator: locator('#target') Expected: "rgb(0, 128, 0)" Received: "rgb(255, 192, 203)" Timeout: 5000ms Call log: - Expect "toHaveCSS" with timeout 5000ms - waiting for locator('#target') 9 × locator resolved to <x-view id="target"></x-view> - unexpected value "rgb(255, 192, 203)" 1891 | }); 1892 | await wait(200); > 1893 | await expect(target).toHaveCSS( | ^ 1894 | 'background-color', 1895 | 'rgb(0, 128, 0)', 1896 | ); // green; at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:1893:28
'background-color',
'rgb(0, 128, 0)',
); // green;
Expand Down Expand Up @@ -2645,7 +2665,7 @@
await goto(page, title);
await expect(
await page.locator('#result'),
).toHaveCSS(

Check failure on line 2668 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (2/2) / check

[firefox] › tests/reactlynx.spec.ts:2663:7 › reactlynx3 tests › elements › svg › basic-element-svg-bindload

9) [firefox] › tests/reactlynx.spec.ts:2663:7 › reactlynx3 tests › elements › svg › basic-element-svg-bindload Retry #2 ─────────────────────────────────────────────────────────────────────────────────────── Error: expect(locator).toHaveCSS(expected) failed Locator: locator('#result') Expected: "rgb(0, 128, 0)" Received: "rgb(255, 0, 0)" Timeout: 5000ms Call log: - Expect "toHaveCSS" with timeout 5000ms - waiting for locator('#result') 9 × locator resolved to <x-view id="result" lynx-computed-display="linear" lynx-linear-orientation="vertical"></x-view> - unexpected value "rgb(255, 0, 0)" 2666 | await expect( 2667 | await page.locator('#result'), > 2668 | ).toHaveCSS( | ^ 2669 | 'background-color', 2670 | 'rgb(0, 128, 0)', 2671 | ); at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:2668:11

Check failure on line 2668 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (2/2) / check

[firefox] › tests/reactlynx.spec.ts:2663:7 › reactlynx3 tests › elements › svg › basic-element-svg-bindload

9) [firefox] › tests/reactlynx.spec.ts:2663:7 › reactlynx3 tests › elements › svg › basic-element-svg-bindload Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: expect(locator).toHaveCSS(expected) failed Locator: locator('#result') Expected: "rgb(0, 128, 0)" Received: "rgb(255, 0, 0)" Timeout: 5000ms Call log: - Expect "toHaveCSS" with timeout 5000ms - waiting for locator('#result') 9 × locator resolved to <x-view id="result" lynx-computed-display="linear" lynx-linear-orientation="vertical"></x-view> - unexpected value "rgb(255, 0, 0)" 2666 | await expect( 2667 | await page.locator('#result'), > 2668 | ).toHaveCSS( | ^ 2669 | 'background-color', 2670 | 'rgb(0, 128, 0)', 2671 | ); at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:2668:11

Check failure on line 2668 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (2/2) / check

[firefox] › tests/reactlynx.spec.ts:2663:7 › reactlynx3 tests › elements › svg › basic-element-svg-bindload

9) [firefox] › tests/reactlynx.spec.ts:2663:7 › reactlynx3 tests › elements › svg › basic-element-svg-bindload Error: expect(locator).toHaveCSS(expected) failed Locator: locator('#result') Expected: "rgb(0, 128, 0)" Received: "rgb(255, 0, 0)" Timeout: 5000ms Call log: - Expect "toHaveCSS" with timeout 5000ms - waiting for locator('#result') 8 × locator resolved to <x-view id="result" lynx-computed-display="linear" lynx-linear-orientation="vertical"></x-view> - unexpected value "rgb(255, 0, 0)" 2666 | await expect( 2667 | await page.locator('#result'), > 2668 | ).toHaveCSS( | ^ 2669 | 'background-color', 2670 | 'rgb(0, 128, 0)', 2671 | ); at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:2668:11
'background-color',
'rgb(0, 128, 0)',
);
Expand Down Expand Up @@ -2974,7 +2994,7 @@
});
await wait(1000);
const lastEvent = eventDetails.pop();
expect(lastEvent.index).toBe(1);

Check failure on line 2997 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (2/2) / check

[chromium] › tests/reactlynx.spec.ts:2976:7 › reactlynx3 tests › elements › x-viewpager-ng › basic-element-x-viewpager-ng-bindchange

5) [chromium] › tests/reactlynx.spec.ts:2976:7 › reactlynx3 tests › elements › x-viewpager-ng › basic-element-x-viewpager-ng-bindchange TypeError: Cannot read properties of undefined (reading 'index') 2995 | await wait(1000); 2996 | const lastEvent = eventDetails.pop(); > 2997 | expect(lastEvent.index).toBe(1); | ^ 2998 | expect(lastEvent.isDragged).not.toBe(undefined); 2999 | }, 3000 | ); at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:2997:28
expect(lastEvent.isDragged).not.toBe(undefined);
},
);
Expand Down Expand Up @@ -3114,7 +3134,7 @@

await page.getByTestId('last').click();
await wait(1000);
expect(changeCalledCount).toBe(1);

Check failure on line 3137 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (2/2) / check

[chromium] › tests/reactlynx.spec.ts:3112:7 › reactlynx3 tests › elements › x-viewpager-ng › basic-element-x-viewpager-ng-bindchange-select-tab

7) [chromium] › tests/reactlynx.spec.ts:3112:7 › reactlynx3 tests › elements › x-viewpager-ng › basic-element-x-viewpager-ng-bindchange-select-tab Error: expect(received).toBe(expected) // Object.is equality Expected: 1 Received: 0 3135 | await page.getByTestId('last').click(); 3136 | await wait(1000); > 3137 | expect(changeCalledCount).toBe(1); | ^ 3138 | if (browserName !== 'webkit') { 3139 | expect(currentIndex).toBe(5); 3140 | } at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:3137:37
if (browserName !== 'webkit') {
expect(currentIndex).toBe(5);
}
Expand Down Expand Up @@ -3185,7 +3205,7 @@
await page.locator('input').click({ force: true });
await wait(100);
const result = await page.locator('.result').first().innerText();
expect(result).toBe('bindfocus');

Check failure on line 3208 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (1/2) / check

[webkit] › tests/reactlynx.spec.ts:3202:7 › reactlynx3 tests › elements › x-input › basic-element-x-input-bindfocus

3) [webkit] › tests/reactlynx.spec.ts:3202:7 › reactlynx3 tests › elements › x-input › basic-element-x-input-bindfocus Error: expect(received).toBe(expected) // Object.is equality Expected: "bindfocus" Received: "" 3206 | await wait(100); 3207 | const result = await page.locator('.result').first().innerText(); > 3208 | expect(result).toBe('bindfocus'); | ^ 3209 | }); 3210 | // input/bindfocus test-case end 3211 | at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:3208:24
});
// input/bindfocus test-case end

Expand Down Expand Up @@ -3289,7 +3309,7 @@
inputDom?.setSelectionRange(2, 5);
});
const result = await page.locator('.result').first().innerText();
expect(result).toBe('2-5');

Check failure on line 3312 in packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts

View workflow job for this annotation

GitHub Actions / Playwright CSR (1/2) / check

[webkit] › tests/reactlynx.spec.ts:3300:7 › reactlynx3 tests › elements › x-input › basic-element-x-input-bindselection

4) [webkit] › tests/reactlynx.spec.ts:3300:7 › reactlynx3 tests › elements › x-input › basic-element-x-input-bindselection Error: expect(received).toBe(expected) // Object.is equality Expected: "2-5" Received: "" 3310 | }); 3311 | const result = await page.locator('.result').first().innerText(); > 3312 | expect(result).toBe('2-5'); | ^ 3313 | }, 3314 | ); 3315 | test( at /__w/lynx-stack/lynx-stack/packages/web-platform/web-core-e2e/tests/reactlynx.spec.ts:3312:26
},
);
test(
Expand Down
35 changes: 7 additions & 28 deletions packages/web-platform/web-core/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@ lynx-view {
width: 100%;
container-name: lynx-view;
container-type: inline-size;
--rpx-unit: 1cqw;
--rpx-unit: calc(1cqw / 7.5);
--ppx-unit: 1cqw;
--vw-unit: 1vw;
--vh-unit: 1vh;
--vw-unit: 1cqw;
--vh-unit: 1cqh;
}

lynx-view[transform-vh] {
container-type: size;
Comment thread
PupilTong marked this conversation as resolved.
}

lynx-view[ssr] {
Expand All @@ -40,31 +44,6 @@ lynx-view::part(page) {
--vh-unit: inherit;
}

@property --rem-unit {
syntax: "<length>";
inherits: true;
}

@property --rpx-unit {
syntax: "<length>";
inherits: true;
}

@property --ppx-unit {
syntax: "<length>";
inherits: true;
}

@property --vw-unit {
syntax: "<length>";
inherits: true;
}

@property --vh-unit {
syntax: "<length>";
inherits: true;
}

@property --lynx-display {
syntax: "linear | flex";
inherits: false;
Expand Down
Loading