Skip to content

Commit b73fcee

Browse files
authored
Merge branch 'dev' into fix-react-state-parent-render-2
2 parents e7f4666 + 50cb3e4 commit b73fcee

File tree

13 files changed

+4947
-6528
lines changed

13 files changed

+4947
-6528
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,18 +158,18 @@ jobs:
158158
pip install --no-cache-dir --upgrade -e .[ci,dev] --progress-bar off
159159
- run:
160160
command: |
161-
nvm install 18 && nvm use 18
161+
nvm install 24 && nvm use 24
162162
- run:
163163
name: npm prereqs
164164
command: |
165-
nvm use 18
165+
nvm use 24
166166
npm ci
167167
cd dash/dash-renderer && npm i && cd ../../
168168
cd components/dash-html-components && npm i && npm run extract && cd ../../
169169
- run:
170170
name: ️️🏗️ build dash
171171
command: |
172-
nvm use 18
172+
nvm use 24
173173
. venv/Scripts/activate
174174
npm run private::build.jupyterlab && npm run private::build.renderer
175175
cd components/dash-html-components && npm run build

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# These owners will be the default owners for everything in
22
# the repo. Unless a later match takes precedence
3-
* @T4rk1n @ndrezn @gvwilson @emilykl
3+
* @T4rk1n @ndrezn @emilykl @camdecoster

@plotly/dash-generator-test-component-typescript/package-lock.json

Lines changed: 223 additions & 180 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

@plotly/dash-generator-test-component-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"ts-jest": "^29.0.3",
3232
"ts-loader": "^9.4.1",
3333
"typescript": "^4.8.4",
34-
"webpack": "^5.76.1",
34+
"webpack": "^5.105.0",
3535
"webpack-cli": "^4.10.0"
3636
},
3737
"peerDependencies": {

components/dash-core-components/src/components/css/datepickers.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,3 +298,8 @@
298298
width: 20px;
299299
height: 20px;
300300
}
301+
302+
.dash-datepicker-calendar-padding {
303+
pointer-events: none;
304+
background: transparent;
305+
}

components/dash-core-components/src/utils/calendar/helpers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ function convertFormatTokens(momentFormat: string): string {
3535
.replace(/Do/g, 'do') // Ordinal day: 1st, 2nd, 3rd
3636
.replace(/YYYY/g, 'yyyy') // 4-digit year
3737
.replace(/YY/g, 'yy') // 2-digit year
38+
.replace(/Y/g, 'y') // Year (numeric, variable length)
3839
.replace(/DD/g, 'dd') // Day of month with leading zero
3940
.replace(/D/g, 'd') // Day of month
4041
.replace(/X/g, 't'); // Unix timestamp (seconds)

components/dash-core-components/tests/integration/calendar/test_portal.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ def click_everything_in_datepicker(datepicker_id, dash_dcc):
2222
popover = dash_dcc.find_element(".dash-datepicker-content")
2323

2424
interactive_elements = []
25-
interactive_elements.extend(popover.find_elements(By.CSS_SELECTOR, "td"))
25+
interactive_elements.extend(
26+
popover.find_elements(
27+
By.CSS_SELECTOR, "td:not(.dash-datepicker-calendar-padding)"
28+
)
29+
)
30+
2631
interactive_elements.extend(popover.find_elements(By.CSS_SELECTOR, "input"))
2732

2833
buttons = reversed(
@@ -36,7 +41,9 @@ def click_everything_in_datepicker(datepicker_id, dash_dcc):
3641
sleep(0.05)
3742
except Exception as e:
3843
print(e)
39-
assert not e, f"Unable to click on {el.tag_name})"
44+
assert (
45+
not e
46+
), f"Unable to click on {el.tag_name} {el.get_attribute('class')})"
4047

4148

4249
def test_dppt000_datepicker_single_default(dash_dcc):

components/dash-core-components/tests/integration/misc/test_popover_visibility.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ def click_everything_in_datepicker(datepicker_id, dash_dcc):
1919
popover = dash_dcc.find_element(".dash-datepicker-content")
2020

2121
interactive_elements = []
22-
interactive_elements.extend(popover.find_elements(By.CSS_SELECTOR, "td"))
22+
interactive_elements.extend(
23+
popover.find_elements(
24+
By.CSS_SELECTOR, "td:not(.dash-datepicker-calendar-padding)"
25+
)
26+
)
2327
interactive_elements.extend(popover.find_elements(By.CSS_SELECTOR, "button"))
2428
interactive_elements.extend(popover.find_elements(By.CSS_SELECTOR, "input"))
2529
for el in interactive_elements:

components/dash-html-components/scripts/extract-elements.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ function extractElements($) {
2222
// experimental, don't add yet
2323
'portal',
2424
'fencedframe',
25-
'selectedcontent'
25+
'selectedcontent',
26+
// Geolocation has a weird formatting catch
27+
`geolocation
28+
Experimental
29+
`
2630
];
2731
// `<section>` is for some reason missing from the reference tables.
2832
const addElements = [

components/dash-table/tests/selenium/test_formatting.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def get_app(props=dict()):
2626
c.update(
2727
dict(
2828
format=dict(
29-
locale=dict(seperate_4digits=False),
29+
locale=dict(separate_4digits=False),
3030
prefix=1000,
3131
specifier=".3f",
3232
)
@@ -36,7 +36,7 @@ def get_app(props=dict()):
3636
c.update(
3737
dict(
3838
format=dict(
39-
locale=dict(symbol=["eq. $", ""], seperate_4digits=False),
39+
locale=dict(symbol=["eq. $", ""], separate_4digits=False),
4040
nully=0,
4141
specifier="$,.2f",
4242
),

0 commit comments

Comments
 (0)