From 2592935e15b19e8be7fa9baa26e1caf7eea424be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Wed, 11 Nov 2026 10:50:37 +0100 Subject: [PATCH 1/9] Update minimatch to 11 through npm overrides Co-Authored-By: Claude Opus 5.5 --- package-lock.json | 476 +++++++++++++--------------------------------- package.json | 20 +- 2 files changed, 153 insertions(+), 343 deletions(-) diff --git a/package-lock.json b/package-lock.json index ffffb3a329..2986aab6a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "eslint": "^10.14.0", "eslint-config-xo": "^0.53.2", "eslint-plugin-html": "^8.2.1", - "eslint-plugin-import-x": "^4.17.1", + "eslint-plugin-import-x": "^4.18.1", "eslint-plugin-markdown": "^5.1.0", "eslint-plugin-unicorn": "^68.0.0", "find-unused-sass-variables": "^6.2.1", @@ -2075,16 +2075,17 @@ } }, "node_modules/@eslint/config-array/node_modules/minimatch": { - "version": "10.2.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", - "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.7.tgz", + "integrity": "sha512-Tnk+M9mPjqKDZlUd77eMSjPjhnlBIa1mABOwetMryIshUwi1YmOBdGFfQnHgn4Z8A66eLT8ENzJrxwYmKfqrZg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.5" + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -3067,95 +3068,12 @@ "url": "https://opencollective.com/libvips" } }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "node_modules/@isaacs/nonrecursive-glob-match": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@isaacs/nonrecursive-glob-match/-/nonrecursive-glob-match-1.1.0.tgz", + "integrity": "sha512-GPm/Dbvk5RLmhRnxXIa7nTpK0xtl4E0wj0MslsuNiJ1FIROU+2+9lgUC/dgF7Ey4QCWhfEsgxilMRMCdHPfDfw==", "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "license": "MIT" - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "license": "MIT", - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } + "license": "BlueOak-1.0.0" }, "node_modules/@istanbuljs/schema": { "version": "0.1.6", @@ -3831,17 +3749,6 @@ "node": ">=0.10" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=14" - } - }, "node_modules/@pkgr/core": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.3.6.tgz", @@ -4930,16 +4837,17 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", - "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.7.tgz", + "integrity": "sha512-Tnk+M9mPjqKDZlUd77eMSjPjhnlBIa1mABOwetMryIshUwi1YmOBdGFfQnHgn4Z8A66eLT8ENzJrxwYmKfqrZg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.8" + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -6778,6 +6686,13 @@ "node": ">=8" } }, + "node_modules/cjs-module-lexer": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-2.3.0.tgz", + "integrity": "sha512-lmNyBzi6iYiqyrExTctfmjd8tInx+dHu9PBomTfH5RXS53c27JMFJgzNv5TyAnm3PgGf+MLy0+Ws41/HlVxdKQ==", + "dev": true, + "license": "MIT" + }, "node_modules/clipboard": { "version": "2.0.11", "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", @@ -7652,13 +7567,6 @@ "node": ">=4" } }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "license": "MIT" - }, "node_modules/electron-to-chromium": { "version": "1.5.428", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.428.tgz", @@ -8140,18 +8048,20 @@ } }, "node_modules/eslint-plugin-import-x": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.17.1.tgz", - "integrity": "sha512-4cdstYkKCyjumM2Q9NSI03K8D2a9F4Ssz33K2lv2hQa4KmR9jPLwk3uWGtNvclfqBrPGfGuMBwsGMbe6dMRbfg==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.18.1.tgz", + "integrity": "sha512-D1h++38NS2Z40zf8jbd2OHqDrnIFRKpdp8sL0jP4xSDGZj6MNwEQua8F+r3tOWjcHrsWuhHOJ7wASWioJ31tfg==", "dev": true, "license": "MIT", "dependencies": { "@typescript-eslint/types": "^8.56.0", + "cjs-module-lexer": "^2.2.1", "comment-parser": "^1.4.1", "debug": "^4.4.1", + "es-module-lexer": "^3.0.3", "eslint-import-context": "^0.1.9", "is-glob": "^4.0.3", - "minimatch": "^9.0.3 || ^10.1.2", + "minimatch": "^9.0.3 || ^10.1.2 || ^11.0.1", "semver": "^7.7.2", "stable-hash-x": "^0.2.0", "unrs-resolver": "^1.9.2" @@ -8199,17 +8109,25 @@ "node": "20 || >=22" } }, + "node_modules/eslint-plugin-import-x/node_modules/es-module-lexer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-3.0.4.tgz", + "integrity": "sha512-BldNY5mwkVu+cQ5Ymn3e6hB9Sx8XHx4ZevWbiUyZbfKxJxYO27Hf0wfzkxIaD5CAJMaGl3YspKELj0ff/7nCMA==", + "dev": true, + "license": "MIT" + }, "node_modules/eslint-plugin-import-x/node_modules/minimatch": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", - "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.7.tgz", + "integrity": "sha512-Tnk+M9mPjqKDZlUd77eMSjPjhnlBIa1mABOwetMryIshUwi1YmOBdGFfQnHgn4Z8A66eLT8ENzJrxwYmKfqrZg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.8" + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -8525,16 +8443,17 @@ "license": "MIT" }, "node_modules/eslint/node_modules/minimatch": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", - "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.7.tgz", + "integrity": "sha512-Tnk+M9mPjqKDZlUd77eMSjPjhnlBIa1mABOwetMryIshUwi1YmOBdGFfQnHgn4Z8A66eLT8ENzJrxwYmKfqrZg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.8" + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -9115,36 +9034,6 @@ "node": ">=20" } }, - "node_modules/foreground-child": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.6", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/format": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", @@ -10383,22 +10272,6 @@ "dev": true, "license": "ISC" }, - "node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "license": "BlueOak-1.0.0", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, "node_modules/jasmine": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-7.0.0.tgz", @@ -10421,72 +10294,59 @@ "dev": true, "license": "MIT" }, + "node_modules/jasmine/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/jasmine/node_modules/brace-expansion": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz", - "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz", + "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "20 || >=22" } }, "node_modules/jasmine/node_modules/glob": { - "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/jasmine/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/jasmine/node_modules/minimatch": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", - "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.2" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/jasmine/node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "version": "14.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-14.0.4.tgz", + "integrity": "sha512-mMiwNKoJZ4HAIRVJxotO6LsNRReA30gQwP9E2/p94tfLv+jygCNpKDjhhSL6OLY6LE371EZm5EAf7RpYuUqlsw==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "minimatch": "^11.0.5", + "minipass": "^7.1.3", + "path-scurry": "^3.0.0" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/jasmine/node_modules/minimatch": { + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.7.tgz", + "integrity": "sha512-Tnk+M9mPjqKDZlUd77eMSjPjhnlBIa1mABOwetMryIshUwi1YmOBdGFfQnHgn4Z8A66eLT8ENzJrxwYmKfqrZg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" + }, + "engines": { + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -11103,6 +10963,16 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/lru-cache": { + "version": "11.5.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.3.tgz", + "integrity": "sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": "20 || >=22" + } + }, "node_modules/magic-string": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.3.tgz", @@ -11313,16 +11183,17 @@ } }, "node_modules/markdownlint-cli/node_modules/minimatch": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz", - "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==", + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.7.tgz", + "integrity": "sha512-Tnk+M9mPjqKDZlUd77eMSjPjhnlBIa1mABOwetMryIshUwi1YmOBdGFfQnHgn4Z8A66eLT8ENzJrxwYmKfqrZg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.8" + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -13370,11 +13241,11 @@ } }, "node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { "node": ">=16 || 14 >=14.17" } @@ -13613,16 +13484,17 @@ } }, "node_modules/nodemon/node_modules/minimatch": { - "version": "10.2.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", - "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-11.0.7.tgz", + "integrity": "sha512-Tnk+M9mPjqKDZlUd77eMSjPjhnlBIa1mABOwetMryIshUwi1YmOBdGFfQnHgn4Z8A66eLT8ENzJrxwYmKfqrZg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^5.0.5" + "@isaacs/nonrecursive-glob-match": "^1.1.0", + "brace-expansion": "^5.0.12" }, "engines": { - "node": "18 || 20 || >=22" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -13976,13 +13848,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "dev": true, - "license": "BlueOak-1.0.0" - }, "node_modules/package-manager-detector": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.9.0.tgz", @@ -14157,6 +14022,23 @@ "node": ">=8" } }, + "node_modules/path-scurry": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-3.0.0.tgz", + "integrity": "sha512-1pTbQqH1wIwMi/eleQ5leFTTCkzFsPcgXNjwOA8YGGW/W4/kHT3dssE7Z6NH+zuqNLOzOB0uaD61yl7cAcVhgg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -15999,22 +15881,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/string-width/node_modules/ansi-regex": { "version": "6.2.2", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", @@ -16083,20 +15949,6 @@ "node": ">=8" } }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -17339,16 +17191,6 @@ } } }, - "node_modules/unstorage/node_modules/lru-cache": { - "version": "11.5.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.0.tgz", - "integrity": "sha512-5YgH9UJd7wVb9hIouI2adWpgqrrICkt070Dnj8EUY1+B4B2P9eRLPAkAAo6NICA7CEhOIeBHl46u9zSNpNu7zA==", - "dev": true, - "license": "BlueOak-1.0.0", - "engines": { - "node": "20 || >=22" - } - }, "node_modules/update-browserslist-db": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.3.tgz", @@ -18288,56 +18130,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "license": "MIT", - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/wrap-ansi/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", diff --git a/package.json b/package.json index ac59727f5e..a43c1d408a 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "eslint": "^10.14.0", "eslint-config-xo": "^0.53.2", "eslint-plugin-html": "^8.2.1", - "eslint-plugin-import-x": "^4.17.1", + "eslint-plugin-import-x": "^4.18.1", "eslint-plugin-markdown": "^5.1.0", "eslint-plugin-unicorn": "^68.0.0", "find-unused-sass-variables": "^6.2.1", @@ -206,7 +206,25 @@ ".browserslistrc" ], "overrides": { + "@typescript-eslint/typescript-estree": { + "minimatch": "^11.0.1" + }, "axios": "^1.16.0", + "eslint": { + "minimatch": "^11.0.1" + }, + "eslint-plugin-import-x": { + "minimatch": "^11.0.1" + }, + "jasmine": { + "glob": "^14.0.4" + }, + "markdownlint-cli": { + "minimatch": "^11.0.1" + }, + "nodemon": { + "minimatch": "^11.0.1" + }, "re2js": "^2.8.7" } } From 026d2d599fa427b84c84e159e61d891de60bf4ec Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 11 Nov 2026 20:27:22 -0800 Subject: [PATCH 2/9] Fix Range refresh, native reset, and RTL alignment (#43305) * fix(range): refresh decorations and honor form resets Let applications refresh bubble configuration and datalist ticks with update() while preserving constructor option priority. Keep drag events on the value-only update path. Refresh decorations after native form reset and release reset handlers and pending work on disposal. Use a decorative div for the bubble so WebKit cannot reset its inner markup as an output control. Align the fill, bubble, and ticks with the native thumb in RTL layouts. * docs(range): note accessible tick preset considerations Record clickable labels as an optional future direction for sparse presets. Require real buttons, keyboard activation, visible focus, and usable targets while keeping ordinary ticks decorative by default. * chore(range): account for the added bundle size The Range refresh and reset fixes exceed three JavaScript bundle limits by small amounts. Raise only those limits to the next standard quarter kilobyte using the repository's bundlewatch helper. * fix(range): honor shared radius and shadow tokens Custom pill radii did not reach the range track or thumb. The track also read a shadow token with no default. Use the shared tokens and state the required prefix step for Sass builds. --- .bundlewatch.config.json | 6 +- js/src/range.ts | 70 ++++++++- js/tests/unit/range.spec.js | 213 ++++++++++++++++++++++++++ scss/forms/_form-range.scss | 28 +++- site/src/content/docs/forms/range.mdx | 20 ++- 5 files changed, 318 insertions(+), 19 deletions(-) diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json index 3d52a9ba24..0411bdd984 100644 --- a/.bundlewatch.config.json +++ b/.bundlewatch.config.json @@ -34,11 +34,11 @@ }, { "path": "./dist/js/bootstrap.bundle.js", - "maxSize": "75.25 kB" + "maxSize": "75.5 kB" }, { "path": "./dist/js/bootstrap.bundle.min.js", - "maxSize": "59.25 kB" + "maxSize": "59.5 kB" }, { "path": "./dist/js/bootstrap.js", @@ -46,7 +46,7 @@ }, { "path": "./dist/js/bootstrap.min.js", - "maxSize": "35.5 kB" + "maxSize": "35.75 kB" } ], "ci": { diff --git a/js/src/range.ts b/js/src/range.ts index fd8c9b6030..0288cf1aa5 100644 --- a/js/src/range.ts +++ b/js/src/range.ts @@ -11,6 +11,10 @@ import SelectorEngine from './dom/selector-engine.js' import { onDocumentReady } from './util/component-functions.js' import type { ComponentConfig } from './util/config.js' +// Future consideration: opt-in clickable labels for sparse tick presets. +// Use real buttons with keyboard activation, visible focus, and usable targets. +// Keep decorative ticks as the default; do not add a tab stop for every tick. + /** * Constants */ @@ -23,9 +27,9 @@ const DATA_API_KEY = '.data-api' const EVENT_CHANGED = `changed${EVENT_KEY}` const EVENT_DOM_CONTENT_LOADED = `DOMContentLoaded${EVENT_KEY}${DATA_API_KEY}` -// `input` is not in EventHandler's native-event list, so it can't be namespaced; bind it raw const EVENT_INPUT = 'input' const EVENT_CHANGE = 'change' +const EVENT_RESET = 'reset' const SELECTOR_RANGE = '.form-range' const SELECTOR_INPUT = '.form-range-input' @@ -46,7 +50,7 @@ type RangeConfig = { const Default: RangeConfig = { bubble: false, // Show a value bubble above the thumb - formatter: null // (value) => string, for the bubble and tick labels + formatter: null // (value) => string, for the bubble } const DefaultType = { @@ -65,6 +69,10 @@ class Range extends BaseComponent { protected declare _bubbleText: HTMLElement | null protected declare _ticks: HTMLElement | null protected declare _updateHandler: () => void + protected declare _initialConfig: Partial + protected declare _form: HTMLFormElement | null + protected declare _resetHandler: (event: Event) => void + protected declare _resetTimeouts: Set constructor(element?: string | Element | null, config?: Partial | null) { super(element, config) @@ -84,11 +92,23 @@ class Range extends BaseComponent { this._bubbleText = null this._ticks = null this._updateHandler = () => this._update() - - if (this._config.bubble) { - this._createBubble() + this._initialConfig = { ...config } + this._form = null + this._resetTimeouts = new Set() + this._resetHandler = event => { + // Native reset restores values after dispatching the reset event. + const timeout = window.setTimeout(() => { + this._resetTimeouts.delete(timeout) + if (!event.defaultPrevented) { + this._update() + } + }, 0) + this._resetTimeouts.add(timeout) } + this._syncBubble() + this._syncForm() + this._createTicks() this._addEventListeners() this._update() @@ -109,6 +129,16 @@ class Range extends BaseComponent { // Public update(): void { + if (!this._input) { + return + } + + this._config = this._getConfig(this._initialConfig) as RangeConfig + this._syncBubble() + this._ticks?.remove() + this._ticks = null + this._createTicks() + this._syncForm() this._update() } @@ -116,6 +146,9 @@ class Range extends BaseComponent { EventHandler.off(this._input, EVENT_INPUT, this._updateHandler) EventHandler.off(this._input, EVENT_CHANGE, this._updateHandler) + EventHandler.off(this._form, EVENT_RESET, this._resetHandler) + this._resetTimeouts?.forEach(timeout => clearTimeout(timeout)) + this._bubble?.remove() this._ticks?.remove() @@ -132,6 +165,31 @@ class Range extends BaseComponent { return config } + protected _syncBubble(): void { + if (this._config.bubble) { + if (!this._bubble) { + this._createBubble() + } + } else { + this._bubble?.remove() + this._bubble = null + this._bubbleText = null + } + } + + protected _syncForm(): void { + const { form } = this._input! + if (form === this._form) { + return + } + + EventHandler.off(this._form, EVENT_RESET, this._resetHandler) + this._resetTimeouts.forEach(timeout => clearTimeout(timeout)) + this._resetTimeouts.clear() + this._form = form + EventHandler.on(this._form, EVENT_RESET, this._resetHandler) + } + protected _addEventListeners(): void { EventHandler.on(this._input, EVENT_INPUT, this._updateHandler) EventHandler.on(this._input, EVENT_CHANGE, this._updateHandler) @@ -171,7 +229,7 @@ class Range extends BaseComponent { protected _createBubble(): void { // Reuse the tooltip markup so we don't duplicate the pill and arrow styles - this._bubble = document.createElement('output') + this._bubble = document.createElement('div') this._bubble.className = `${CLASS_NAME_BUBBLE} tooltip bs-tooltip-top show` this._bubble.setAttribute('aria-hidden', 'true') diff --git a/js/tests/unit/range.spec.js b/js/tests/unit/range.spec.js index 4c8acebd53..9cf48b39fa 100644 --- a/js/tests/unit/range.spec.js +++ b/js/tests/unit/range.spec.js @@ -116,6 +116,219 @@ describe('Range', () => { }) }) + describe('explicit refresh', () => { + it('should refresh a programmatic value without a native input event', () => { + fixtureEl.innerHTML = getRangeHtml('data-bs-bubble') + const wrapper = fixtureEl.querySelector('.form-range') + const input = wrapper.querySelector('input') + const range = new Range(wrapper) + input.value = '75' + expect(wrapper.style.getPropertyValue('--bs-range-fill')).toEqual('0.5') + range.update() + expect(wrapper.style.getPropertyValue('--bs-range-fill')).toEqual('0.75') + expect(wrapper.querySelector('.tooltip-inner').textContent).toEqual('75') + }) + + it('should apply added, false, removed, and bare bubble attributes without duplicates', () => { + fixtureEl.innerHTML = getRangeHtml() + const wrapper = fixtureEl.querySelector('.form-range') + const range = new Range(wrapper) + for (const value of ['true', 'false', '', null, 'true']) { + if (value === null) { + wrapper.removeAttribute('data-bs-bubble') + } else { + wrapper.setAttribute('data-bs-bubble', value) + } + + range.update() + range.update() + const enabled = value === 'true' || value === '' + expect(wrapper.querySelectorAll('.form-range-bubble').length).toEqual(enabled ? 1 : 0) + if (enabled) { + expect(wrapper.querySelector('.tooltip-inner').textContent).toEqual('50') + } + } + }) + + it('should preserve copied JavaScript options over current data configuration', () => { + fixtureEl.innerHTML = getRangeHtml('data-bs-bubble="false"') + const wrapper = fixtureEl.querySelector('.form-range') + const options = { bubble: true, formatter: value => `${value}%` } + const range = new Range(wrapper, options) + options.bubble = false + wrapper.dataset.bsConfig = '{"bubble":false}' + range.update() + expect(wrapper.querySelector('.tooltip-inner').textContent).toEqual('50%') + }) + + it('should reread JSON configuration and validate before changing decorations', () => { + fixtureEl.innerHTML = getRangeHtml() + const wrapper = fixtureEl.querySelector('.form-range') + const range = new Range(wrapper) + wrapper.dataset.bsConfig = '{"bubble":true}' + range.update() + expect(wrapper.querySelector('.form-range-bubble')).not.toBeNull() + wrapper.dataset.bsBubble = 'invalid' + expect(() => range.update()).toThrowError(TypeError) + expect(wrapper.querySelectorAll('.form-range-bubble').length).toEqual(1) + }) + + it('should not refresh configuration or rebuild ticks during input events', () => { + fixtureEl.innerHTML = ` + ${getRangeHtml('', 'list="live-ticks"')} + + ` + const wrapper = fixtureEl.querySelector('.form-range') + const range = new Range(wrapper) + const ticks = wrapper.querySelector('.form-range-ticks') + wrapper.dataset.bsBubble = 'true' + wrapper.querySelector('input').dispatchEvent(createEvent('input')) + expect(wrapper.querySelector('.form-range-bubble')).toBeNull() + expect(wrapper.querySelector('.form-range-ticks')).toEqual(ticks) + range.dispose() + }) + + it('should tolerate an instance without an input', () => { + fixtureEl.innerHTML = '
' + const range = new Range(fixtureEl.firstElementChild) + expect(() => range.update()).not.toThrow() + expect(() => range.dispose()).not.toThrow() + }) + + it('should rebuild current tick values, labels, bounds, and list association', () => { + fixtureEl.innerHTML = ` + ${getRangeHtml('', 'list="first-list"')} + + + ` + const wrapper = fixtureEl.querySelector('.form-range') + const input = wrapper.querySelector('input') + const range = new Range(wrapper) + const option = fixtureEl.querySelector('#second-list option') + input.setAttribute('list', 'second-list') + input.max = '200' + range.update() + expect(wrapper.querySelector('.form-range-ticks').style.gridTemplateColumns).toEqual('0.25fr 0.75fr') + expect(wrapper.querySelector('.form-range-tick-label').textContent).toEqual('Center') + option.value = '100' + option.label = 'New label' + input.min = '50' + range.update() + range.update() + expect(wrapper.querySelectorAll('.form-range-ticks').length).toEqual(1) + expect(wrapper.querySelectorAll('.form-range-tick').length).toEqual(1) + expect(wrapper.querySelector('.form-range-tick-label').textContent).toEqual('New label') + fixtureEl.querySelector('#second-list').replaceChildren() + range.update() + expect(wrapper.querySelector('.form-range-ticks')).toBeNull() + fixtureEl.querySelector('#second-list').append(option) + range.update() + input.removeAttribute('list') + range.update() + expect(wrapper.querySelector('.form-range-ticks')).toBeNull() + }) + }) + + describe('native reset', () => { + const settle = () => new Promise(resolve => { + setTimeout(resolve, 10) + }) + const prepare = (external = false) => { + const control = getRangeHtml('data-bs-bubble', external ? 'form="range-form"' : '') + fixtureEl.innerHTML = ` +
${external ? '' : control}
+ ${external ? control : ''} + ` + const wrapper = fixtureEl.querySelector('.form-range') + const input = wrapper.querySelector('input') + const form = fixtureEl.querySelector('form') + const range = new Range(wrapper) + input.value = '80' + range.update() + return { + wrapper, input, form, range + } + } + + for (const external of [false, true]) { + it(`should refresh after a real reset button restores an ${external ? 'externally associated' : 'enclosed'} input`, async () => { + const { wrapper, form, range } = prepare(external) + form.querySelector('button').click() + await settle() + expect(wrapper.style.getPropertyValue('--bs-range-fill')).toEqual('0.5') + expect(wrapper.querySelector('.tooltip-inner').textContent).toEqual('50') + expect(wrapper.querySelector('.tooltip-arrow')).not.toBeNull() + expect(wrapper.querySelector('.form-range-bubble').tagName).toEqual('DIV') + range.dispose() + }) + } + + it('should respect reset cancellation by a later listener', async () => { + const { wrapper, input, form, range } = prepare() + let events = 0 + input.addEventListener('changed.bs.range', () => events++) + form.addEventListener('reset', event => event.preventDefault()) + form.reset() + await settle() + expect(input.value).toEqual('80') + expect(wrapper.style.getPropertyValue('--bs-range-fill')).toEqual('0.8') + expect(events).toEqual(0) + range.dispose() + }) + + it('should keep a completed reset when a subsequent reset is canceled', async () => { + const { wrapper, form, range } = prepare() + form.reset() + form.addEventListener('reset', event => event.preventDefault(), { once: true }) + form.reset() + await settle() + expect(wrapper.querySelector('.tooltip-inner').textContent).toEqual('50') + range.dispose() + }) + + it('should cancel pending resets and release the listener on disposal', async () => { + const { input, form, range } = prepare() + let events = 0 + input.addEventListener('changed.bs.range', () => events++) + form.reset() + range.dispose() + await settle() + form.reset() + await settle() + expect(events).toEqual(0) + }) + + it('should preserve other Range listeners when one instance is disposed', async () => { + const { wrapper, form, range } = prepare() + form.insertAdjacentHTML('beforeend', getRangeHtml('data-bs-bubble')) + const second = form.querySelectorAll('.form-range')[1] + const other = new Range(second) + second.querySelector('input').value = '90' + other.update() + range.dispose() + form.reset() + await settle() + expect(second.querySelector('.tooltip-inner').textContent).toEqual('50') + expect(wrapper.querySelector('.form-range-bubble')).toBeNull() + other.dispose() + }) + + it('should rebind the form association on explicit update', async () => { + const { wrapper, input, form, range } = prepare(true) + form.insertAdjacentHTML('afterend', '
') + input.setAttribute('form', 'other-form') + range.update() + input.value = '70' + form.reset() + await settle() + expect(wrapper.querySelector('.tooltip-inner').textContent).toEqual('80') + fixtureEl.querySelector('#other-form').reset() + await settle() + expect(wrapper.querySelector('.tooltip-inner').textContent).toEqual('50') + range.dispose() + }) + }) + describe('bubble', () => { it('should create a tooltip-based value bubble when enabled', () => { fixtureEl.innerHTML = getRangeHtml('data-bs-bubble') diff --git a/scss/forms/_form-range.scss b/scss/forms/_form-range.scss index 4bd99fe4c0..9f093c5bfd 100644 --- a/scss/forms/_form-range.scss +++ b/scss/forms/_form-range.scss @@ -17,14 +17,16 @@ $range-tokens: defaults( --range-track-height: .5rem, --range-track-cursor: pointer, --range-track-bg: var(--bg-3), - --range-track-border-radius: 1rem, + --range-track-border-radius: var(--radius-pill), + --range-track-box-shadow: var(--box-shadow-inset), --range-track-fill-bg: var(--theme-bg, var(--primary-base)), + --range-track-fill-direction: to right, --range-track-disabled-bg: color-mix(in oklch, var(--bg-4), var(--fg-3)), --range-thumb-width: 1rem, --range-thumb-height: var(--range-thumb-width), --range-thumb-bg: var(--theme-bg, var(--primary-base)), --range-thumb-border: var(--range-thumb-bg) solid var(--border-color), - --range-thumb-border-radius: 1rem, + --range-thumb-border-radius: var(--radius-pill), --range-thumb-box-shadow: "0 1px 2px rgb(0 0 0 / 7.5%), 0 2px 4px rgb(0 0 0 / 7.5%)", --range-thumb-active-bg: color-mix(in oklch, var(--theme-bg, var(--primary-base)) 70%, var(--bg-body)), --range-thumb-disabled-bg: var(--fg-3), @@ -69,7 +71,7 @@ $range-tokens: defaults( background-color: var(--range-track-bg); background-image: linear-gradient( - to right, + var(--range-track-fill-direction), var(--range-track-fill-bg) calc(var(--range-fill, 0) * 100%), transparent calc(var(--range-fill, 0) * 100%) ); @@ -86,6 +88,10 @@ $range-tokens: defaults( position: relative; display: block; width: 100%; + + &:dir(rtl) { + --range-track-fill-direction: to left; + } } .form-range-input { @@ -164,26 +170,34 @@ $range-tokens: defaults( // pill and arrow. We only add the static positioning the Tooltip plugin would normally do. .form-range-bubble { position: absolute; + inset-inline-start: calc((var(--range-thumb-width) * .5) + var(--range-fill, 0) * (100% - var(--range-thumb-width))); bottom: 100%; - left: calc((var(--range-thumb-width) * .5) + var(--range-fill, 0) * (100% - var(--range-thumb-width))); margin-bottom: var(--tooltip-arrow-height); pointer-events: none; transform: translateX(-50%); + &:dir(rtl) { + transform: translateX(50%); + } + .tooltip-arrow { position: absolute; + inset-inline-start: 50%; bottom: calc(-1 * var(--tooltip-arrow-height)); - left: 50%; transform: translateX(-50%); + + &:dir(rtl) { + transform: translateX(50%); + } } } // Tick marks generated from the linked . Plugin builds `grid-template-columns` // from the gaps between values so each tick lands on a grid line (handles uneven values). - // Track is inset by 1/4th of the thumb width to keep alignment. + // Track is inset by half the thumb width to match its center at each end. .form-range-ticks { display: grid; - padding-inline: calc(var(--range-thumb-width) * .25); + padding-inline: calc(var(--range-thumb-width) * .5); } .form-range-tick { diff --git a/site/src/content/docs/forms/range.mdx b/site/src/content/docs/forms/range.mdx index 27855bc45b..e884ce4244 100644 --- a/site/src/content/docs/forms/range.mdx +++ b/site/src/content/docs/forms/range.mdx @@ -64,6 +64,14 @@ Add `data-bs-bubble` to the wrapper to show a value bubble that follows the thum `} /> +To change the bubble after initialization, change `data-bs-bubble` and call `update()`. JavaScript options passed to the constructor still take priority over data attributes. + +```js +const element = document.querySelector('.form-range') +element.dataset.bsBubble = 'true' +bootstrap.Range.getOrCreateInstance(element).update() +``` + ## Tick marks Link a `` to the input with the `list` attribute and the plugin renders a tick mark for each `