Skip to content

Commit 61ed497

Browse files
isoosisoos
authored
Upgrade dartdoc (and page template) (#8807)
1 parent 8bd3274 commit 61ed497

38 files changed

+2156
-2320
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ Important changes to data models, configuration, and migrations between each
22
AppEngine version, listed here to ease deployment and troubleshooting.
33

44
## Next Release (replace with git tag when deployed)
5+
* Bump runtimeVersion to `2025.06.03`.
6+
* Upgraded dartdoc to `8.3.4`.
57

68
## `20250603t091500-all`
79
* Bump runtimeVersion to `2025.06.02`.

‎app/lib/dartdoc/dartdoc_page.dart

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -190,24 +190,25 @@ extension DartDocPageRender on DartDocPage {
190190
placeholder: 'Loading search...',
191191
),
192192
),
193-
d.div(
193+
d.button(
194194
id: 'theme-button',
195195
classes: ['toggle'],
196-
attributes: {'title': 'Toggle brightness'},
197-
child: d.label(
198-
attributes: {'for': 'theme'},
199-
children: [
200-
d.input(id: 'theme', type: 'checkbox', value: 'light-theme'),
201-
d.span(
202-
id: 'dark-theme-button',
203-
classes: ['material-symbols-outlined'],
204-
text: 'dark_mode'),
205-
d.span(
206-
id: 'light-theme-button',
207-
classes: ['material-symbols-outlined'],
208-
text: 'light_mode'),
209-
],
210-
),
196+
ariaLabel: 'Light and dark mode toggle',
197+
attributes: {'title': 'Toggle between light and dark mode'},
198+
children: [
199+
d.span(
200+
id: 'dark-theme-button',
201+
classes: ['material-symbols-outlined'],
202+
attributes: {'aria-hidden': 'true'},
203+
text: 'dark_mode',
204+
),
205+
d.span(
206+
id: 'light-theme-button',
207+
classes: ['material-symbols-outlined'],
208+
attributes: {'aria-hidden': 'true'},
209+
text: 'light_mode',
210+
),
211+
],
211212
),
212213
]);
213214

‎app/lib/shared/versions.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
2424
/// when the version switch happens.
2525
const _acceptedRuntimeVersions = <String>[
2626
// The current [runtimeVersion].
27-
'2025.06.02',
27+
'2025.06.03',
2828
// Fallback runtime versions.
29+
'2025.06.02',
2930
'2025.05.21',
30-
'2025.05.15',
3131
];
3232

3333
/// Sets the current runtime versions.
@@ -74,4 +74,4 @@ final semanticToolStableFlutterSdkVersion =
7474
final String panaVersion = pana.packageVersion;
7575

7676
// keep in-sync with pkg/pub-worker/lib/src/bin/pana_wrapper.dart
77-
final String dartdocVersion = '8.3.3';
77+
final String dartdocVersion = '8.3.4';

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/index.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@
3636
<form class="search navbar-right" role="search">
3737
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
3838
</form>
39-
<div id="theme-button" class="toggle" title="Toggle brightness">
40-
<label for="theme">
41-
<input id="theme" type="checkbox" value="light-theme"/>
42-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
43-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
44-
</label>
45-
</div>
39+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
40+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
41+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
42+
</button>
4643
</header>
4744
<main>
4845
<div id="dartdoc-main-content" class="main-content">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass-class.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,10 @@
4242
<form class="search navbar-right" role="search">
4343
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4444
</form>
45-
<div id="theme-button" class="toggle" title="Toggle brightness">
46-
<label for="theme">
47-
<input id="theme" type="checkbox" value="light-theme"/>
48-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
49-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
50-
</label>
51-
</div>
45+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
46+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
47+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
48+
</button>
5249
</header>
5350
<main>
5451
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/oxygen-library-sidebar.html" data-below-sidebar="oxygen/MainClass-class-sidebar.html">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/MainClass.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@
4545
<form class="search navbar-right" role="search">
4646
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4747
</form>
48-
<div id="theme-button" class="toggle" title="Toggle brightness">
49-
<label for="theme">
50-
<input id="theme" type="checkbox" value="light-theme"/>
51-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
52-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
53-
</label>
54-
</div>
48+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
49+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
50+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
51+
</button>
5552
</header>
5653
<main>
5754
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/MainClass-class-sidebar.html" data-below-sidebar="">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/text.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@
4545
<form class="search navbar-right" role="search">
4646
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4747
</form>
48-
<div id="theme-button" class="toggle" title="Toggle brightness">
49-
<label for="theme">
50-
<input id="theme" type="checkbox" value="light-theme"/>
51-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
52-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
53-
</label>
54-
</div>
48+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
49+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
50+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
51+
</button>
5552
</header>
5653
<main>
5754
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/MainClass-class-sidebar.html" data-below-sidebar="">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toLowerCase.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@
4545
<form class="search navbar-right" role="search">
4646
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4747
</form>
48-
<div id="theme-button" class="toggle" title="Toggle brightness">
49-
<label for="theme">
50-
<input id="theme" type="checkbox" value="light-theme"/>
51-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
52-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
53-
</label>
54-
</div>
48+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
49+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
50+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
51+
</button>
5552
</header>
5653
<main>
5754
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/MainClass-class-sidebar.html" data-below-sidebar="">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/MainClass/toString.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@
4545
<form class="search navbar-right" role="search">
4646
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4747
</form>
48-
<div id="theme-button" class="toggle" title="Toggle brightness">
49-
<label for="theme">
50-
<input id="theme" type="checkbox" value="light-theme"/>
51-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
52-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
53-
</label>
54-
</div>
48+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
49+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
50+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
51+
</button>
5552
</header>
5653
<main>
5754
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/MainClass-class-sidebar.html" data-below-sidebar="">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,10 @@
4242
<form class="search navbar-right" role="search">
4343
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4444
</form>
45-
<div id="theme-button" class="toggle" title="Toggle brightness">
46-
<label for="theme">
47-
<input id="theme" type="checkbox" value="light-theme"/>
48-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
49-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
50-
</label>
51-
</div>
45+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
46+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
47+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
48+
</button>
5249
</header>
5350
<main>
5451
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/oxygen-library-sidebar.html" data-below-sidebar="oxygen/TypeEnum-enum-sidebar.html">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/TypeEnum/values-constant.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@
4545
<form class="search navbar-right" role="search">
4646
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4747
</form>
48-
<div id="theme-button" class="toggle" title="Toggle brightness">
49-
<label for="theme">
50-
<input id="theme" type="checkbox" value="light-theme"/>
51-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
52-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
53-
</label>
54-
</div>
48+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
49+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
50+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
51+
</button>
5552
</header>
5653
<main>
5754
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/TypeEnum-enum-sidebar.html" data-below-sidebar="">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/index.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,10 @@
3939
<form class="search navbar-right" role="search">
4040
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4141
</form>
42-
<div id="theme-button" class="toggle" title="Toggle brightness">
43-
<label for="theme">
44-
<input id="theme" type="checkbox" value="light-theme"/>
45-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
46-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
47-
</label>
48-
</div>
42+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
43+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
44+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
45+
</button>
4946
</header>
5047
<main>
5148
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="" data-below-sidebar="oxygen/oxygen-library-sidebar.html">

‎app/test/task/testdata/goldens/documentation/oxygen/1.0.0/oxygen/main.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,10 @@
4242
<form class="search navbar-right" role="search">
4343
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4444
</form>
45-
<div id="theme-button" class="toggle" title="Toggle brightness">
46-
<label for="theme">
47-
<input id="theme" type="checkbox" value="light-theme"/>
48-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
49-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
50-
</label>
51-
</div>
45+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
46+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
47+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
48+
</button>
5249
</header>
5350
<main>
5451
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/oxygen-library-sidebar.html" data-below-sidebar="">

‎app/test/task/testdata/goldens/documentation/oxygen/2.0.0/index.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@
3636
<form class="search navbar-right" role="search">
3737
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
3838
</form>
39-
<div id="theme-button" class="toggle" title="Toggle brightness">
40-
<label for="theme">
41-
<input id="theme" type="checkbox" value="light-theme"/>
42-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
43-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
44-
</label>
45-
</div>
39+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
40+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
41+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
42+
</button>
4643
</header>
4744
<main>
4845
<div id="dartdoc-main-content" class="main-content">

‎app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass-class.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,10 @@
4242
<form class="search navbar-right" role="search">
4343
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4444
</form>
45-
<div id="theme-button" class="toggle" title="Toggle brightness">
46-
<label for="theme">
47-
<input id="theme" type="checkbox" value="light-theme"/>
48-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
49-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
50-
</label>
51-
</div>
45+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
46+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
47+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
48+
</button>
5249
</header>
5350
<main>
5451
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/oxygen-library-sidebar.html" data-below-sidebar="oxygen/MainClass-class-sidebar.html">

‎app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/MainClass.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@
4545
<form class="search navbar-right" role="search">
4646
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4747
</form>
48-
<div id="theme-button" class="toggle" title="Toggle brightness">
49-
<label for="theme">
50-
<input id="theme" type="checkbox" value="light-theme"/>
51-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
52-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
53-
</label>
54-
</div>
48+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
49+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
50+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
51+
</button>
5552
</header>
5653
<main>
5754
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/MainClass-class-sidebar.html" data-below-sidebar="">

‎app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/text.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@
4545
<form class="search navbar-right" role="search">
4646
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4747
</form>
48-
<div id="theme-button" class="toggle" title="Toggle brightness">
49-
<label for="theme">
50-
<input id="theme" type="checkbox" value="light-theme"/>
51-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
52-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
53-
</label>
54-
</div>
48+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
49+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
50+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
51+
</button>
5552
</header>
5653
<main>
5754
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/MainClass-class-sidebar.html" data-below-sidebar="">

‎app/test/task/testdata/goldens/documentation/oxygen/2.0.0/oxygen/MainClass/toLowerCase.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,10 @@
4545
<form class="search navbar-right" role="search">
4646
<input id="search-box" class="form-control typeahead" type="text" placeholder="Loading search..." autocomplete="off"/>
4747
</form>
48-
<div id="theme-button" class="toggle" title="Toggle brightness">
49-
<label for="theme">
50-
<input id="theme" type="checkbox" value="light-theme"/>
51-
<span id="dark-theme-button" class="material-symbols-outlined">dark_mode</span>
52-
<span id="light-theme-button" class="material-symbols-outlined">light_mode</span>
53-
</label>
54-
</div>
48+
<button id="theme-button" class="toggle" aria-label="Light and dark mode toggle" title="Toggle between light and dark mode">
49+
<span id="dark-theme-button" class="material-symbols-outlined" aria-hidden="true">dark_mode</span>
50+
<span id="light-theme-button" class="material-symbols-outlined" aria-hidden="true">light_mode</span>
51+
</button>
5552
</header>
5653
<main>
5754
<div id="dartdoc-main-content" class="main-content" data-above-sidebar="oxygen/MainClass-class-sidebar.html" data-below-sidebar="">

0 commit comments

Comments
 (0)