Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main-beta' into epic/integration…
Browse files Browse the repository at this point in the history
…-tests

# Conflicts:
#	package-lock.json
  • Loading branch information
ala-n committed Feb 15, 2024
2 parents d644a89 + 81d0a5a commit ffbce39
Show file tree
Hide file tree
Showing 8 changed files with 384 additions and 217 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## [5.0.0-beta.10](https://github.com/exadel-inc/esl/compare/v5.0.0-beta.9...v5.0.0-beta.10) (2024-02-14)


### Features

* **esl-event-listener:** ootb ability to skip custom `longwheel` and `swipe` events in case of content scrolling ([#2098](https://github.com/exadel-inc/esl/issues/2098)) ([ecc849f](https://github.com/exadel-inc/esl/commit/ecc849f26a8444ea8b840e698afab18e79e80391)), closes [#2085](https://github.com/exadel-inc/esl/issues/2085)
* **esl-popup:** rework esl-popup styles to use CSS variables ([cd781b9](https://github.com/exadel-inc/esl/commit/cd781b9195b876a24debb574410423e853ea3e1a))


### Bug Fixes

* **microtask:** fix argument list on next fn call ([f421e88](https://github.com/exadel-inc/esl/commit/f421e882e4fb01ad691bf94209aab486c22cd50b))
* **swipe:** fix swipe tests ([e1aefb8](https://github.com/exadel-inc/esl/commit/e1aefb8f3ac08b19e40cb138c413dd659ac3500d))
2 changes: 1 addition & 1 deletion eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@exadel/eslint-plugin-esl",
"version": "5.0.0-beta.9",
"version": "5.0.0-beta.10",
"keywords": [
"eslint",
"eslint-plugin",
Expand Down
548 changes: 350 additions & 198 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@exadel/esl",
"version": "5.0.0-beta.9",
"version": "5.0.0-beta.10",
"private": false,
"description": "Exadel Smart Library (ESL) is the lightweight custom elements library that provide a set of super-flexible components",
"license": "MIT",
Expand Down Expand Up @@ -90,8 +90,8 @@
"@types/youtube": "0.0.50"
},
"devDependencies": {
"@commitlint/cli": "^18.5.0",
"@commitlint/config-conventional": "^18.5.0",
"@commitlint/cli": "^18.6.1",
"@commitlint/config-conventional": "^18.6.1",
"@exadel/eslint-plugin-esl": "file:eslint",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/commit-analyzer": "^11.1.0",
Expand All @@ -100,29 +100,29 @@
"@semantic-release/npm": "^11.0.2",
"@semantic-release/release-notes-generator": "^12.1.0",
"@types/jest": "^29.5.12",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"chokidar-cli": "^3.0.0",
"concurrently": "^8.2.2",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"eslint": "^8.56.0",
"eslint-plugin-editorconfig": "^4.0.3",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-sonarjs": "^0.23.0",
"eslint-plugin-sonarjs": "^0.24.0",
"eslint-plugin-tsdoc": "^0.2.17",
"foreach-cli": "^1.8.1",
"husky": "^9.0.10",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"kleur": "^4.1.5",
"less": "^4.2.0",
"lint-staged": "^15.2.1",
"postcss": "^8.4.33",
"lint-staged": "^15.2.2",
"postcss": "^8.4.35",
"postcss-less": "^6.0.0",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"semantic-release": "^23.0.0",
"semantic-release": "^23.0.2",
"smoothscroll-polyfill": "^0.4.4",
"stylelint": "^16.2.1",
"stylelint-prettier": "^5.0.0",
Expand Down
4 changes: 2 additions & 2 deletions site/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@exadel/esl-website",
"version": "5.0.0-beta.9",
"version": "5.0.0-beta.10",
"private": true,
"description": "ESL Website source",
"homepage": "https://esl-ui.com/",
Expand Down Expand Up @@ -36,7 +36,7 @@
"@exadel/ui-playground": "2.0.0-beta.12",
"@juggle/resize-observer": "^3.4.0",
"@types/prismjs": "^1.26.3",
"@types/smoothscroll-polyfill": "^0.3.3",
"@types/smoothscroll-polyfill": "^0.3.4",
"clean-css-cli": "^5.6.3",
"html-minifier-terser": "^7.2.0",
"image-size": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion site/src/localdev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ import {ESLDemoAnchorLink} from './anchor/anchor-link';
import {ESLDemoBanner} from './banner/banner';
import {ESLDemoSwipeArea, ESLDemoWheelArea} from './esl-events-demo/esl-events-demo';

ESLVSizeCSSProxy.observe();
if (!CSS.supports('(height: 100dvh) or (width: 100dvw)')) ESLVSizeCSSProxy.observe();

// Register Demo components
ESLDemoAutofocus.register();
Expand Down
7 changes: 4 additions & 3 deletions site/src/navigation/sidebar/sidebar.less
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@ esl-d-sidebar {
@media @md-xl {
position: relative;
top: 0;
/* stylelint-disable */
height: 100vh;
height: var(--100vh, 100vh);
/* stylelint-enable */
max-width: 72px;

@supports (height: 100dvh) {
height: 100dvh;
}
}

&.open {
Expand Down
7 changes: 4 additions & 3 deletions site/src/page/base-layout.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@

body {
width: 100%;
/* stylelint-disable */
height: 100vh;
height: var(--100vh, 100vh);
/* stylelint-enable */

@supports (height: 100dvh) {
height: 100dvh;
}
}
}

Expand Down

0 comments on commit ffbce39

Please sign in to comment.