diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API23_HDPI_480x800/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API23_HDPI_480x800/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..e0955328e Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API23_HDPI_480x800/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_XXHDPI_1080x1920/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_XXHDPI_1080x1920/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..2a08ad06e Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_XXHDPI_1080x1920/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API25_XHDPI_720x1280/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API25_XHDPI_720x1280/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..04f712707 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API25_XHDPI_720x1280/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XXXHDPI_1440x2560/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XXXHDPI_1440x2560/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..cc29d594b Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XXXHDPI_1440x2560/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XXXHDPI_1440x2560/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XXXHDPI_1440x2560/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..0ebd5e74f Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XXXHDPI_1440x2560/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API27_XHDPI_720x1440/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API27_XHDPI_720x1440/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..7bd261886 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API27_XHDPI_720x1440/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API27_XHDPI_720x1440/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API27_XHDPI_720x1440/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..c19d1db20 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API27_XHDPI_720x1440/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_1080x2160/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_1080x2160/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..24e5c9d68 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_1080x2160/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_1080x2160/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_1080x2160/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png new file mode 100644 index 000000000..cbee76d22 Binary files /dev/null and b/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_1080x2160/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/baseline-with-vertical-containers.png differ diff --git a/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_320@2x.png b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_320@2x.png new file mode 100644 index 000000000..e252bd4b7 Binary files /dev/null and b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_320@2x.png differ diff --git a/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_375@2x.png b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_375@2x.png new file mode 100644 index 000000000..e252bd4b7 Binary files /dev/null and b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_375@2x.png differ diff --git a/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_375@3x.png b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_375@3x.png new file mode 100644 index 000000000..fe9e0c862 Binary files /dev/null and b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_375@3x.png differ diff --git a/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_414@2x.png b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_414@2x.png new file mode 100644 index 000000000..e252bd4b7 Binary files /dev/null and b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_414@2x.png differ diff --git a/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_414@3x.png b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_414@3x.png new file mode 100644 index 000000000..fe9e0c862 Binary files /dev/null and b/client/ios/Tests/reference_snapshots/div-container/baseline-with-vertical-containers_414@3x.png differ diff --git a/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/baseline-with-vertical-containers/chromeMobile/baseline-with-vertical-containers.png b/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/baseline-with-vertical-containers/chromeMobile/baseline-with-vertical-containers.png new file mode 100644 index 000000000..94e0f0949 Binary files /dev/null and b/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/baseline-with-vertical-containers/chromeMobile/baseline-with-vertical-containers.png differ diff --git a/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/baseline-with-vertical-containers/firefoxMobile/baseline-with-vertical-containers.png b/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/baseline-with-vertical-containers/firefoxMobile/baseline-with-vertical-containers.png new file mode 100644 index 000000000..3f4441e6d Binary files /dev/null and b/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/baseline-with-vertical-containers/firefoxMobile/baseline-with-vertical-containers.png differ diff --git a/test_data/snapshot_test_data/div-container/baseline-with-vertical-containers.json b/test_data/snapshot_test_data/div-container/baseline-with-vertical-containers.json new file mode 100644 index 000000000..4c7fc26d1 --- /dev/null +++ b/test_data/snapshot_test_data/div-container/baseline-with-vertical-containers.json @@ -0,0 +1,185 @@ +{ + "templates": { + "inner_container": { + "type": "container", + "border": { + "stroke": { + "color": "#0000EE" + } + }, + "orientation": "vertical", + "width": { + "type": "wrap_content" + } + }, + "inner_text": { + "type": "text", + "height": { + "type": "wrap_content" + }, + "width": { + "type": "wrap_content" + }, + "border": { + "stroke": { + "color": "#0000EE" + } + }, + "paddings": { + "left": 5, + "top": 5, + "right": 5, + "bottom": 5 + } + } + }, + "card": { + "log_id": "snapshot_test_card", + "states": [ + { + "state_id": 0, + "div": { + "type": "container", + "orientation": "vertical", + "width": { + "type": "wrap_content" + }, + "height": { + "type": "wrap_content" + }, + "background": [ + { + "type": "solid", + "color": "#FFFFFF" + } + ], + "layout_mode": "no_wrap", + "items": [ + { + "type": "text", + "text": "Linear container with baseline alignment with inner vertical containers:", + "width": { + "type": "wrap_content" + }, + "height": { + "type": "wrap_content" + }, + "paddings": { + "left": 10, + "top": 10, + "bottom": 10 + } + }, + { + "type": "container", + "border": { + "stroke": { + "color": "#FF0000" + } + }, + "orientation": "horizontal", + "width": { + "type": "wrap_content" + }, + "height": { + "type": "wrap_content" + }, + "content_alignment_vertical": "baseline", + "layout_mode": "no_wrap", + "items": [ + { + "type": "text", + "height": { + "type": "wrap_content" + }, + "width": { + "type": "wrap_content" + }, + "border": { + "stroke": { + "color": "#FF0000" + } + }, + "text": "External item.", + "font_size": 10, + "paddings": { + "left": 5, + "top": 10, + "right": 5, + "bottom": 5 + }, + "margins": { + "top": 10 + } + }, + { + "type": "inner_container", + "height": { + "type": "wrap_content" + }, + "paddings": { + "top": 10, + "bottom": 5 + }, + "content_alignment_vertical": "top", + "items": [ + { + "type": "inner_text", + "text": "Top aligned", + "font_size": 10 + }, + { + "type": "inner_text", + "text": "container.", + "font_size": 16 + } + ] + }, + { + "type": "inner_container", + "height": { + "type": "wrap_content" + }, + "paddings": { + "top": 5 + }, + "content_alignment_vertical": "baseline", + "items": [ + { + "type": "inner_text", + "text": "Baseline aligned", + "font_size": 10 + }, + { + "type": "inner_text", + "text": "container.", + "font_size": 16 + } + ] + }, + { + "type": "inner_container", + "height": { + "type": "match_parent" + }, + "items": [ + { + "type": "inner_text", + "text": "Match_parent", + "font_size": 10 + }, + { + "type": "inner_text", + "text": "height.", + "font_size": 16 + } + ] + } + ] + } + ] + } + } + ] + } +}