Skip to content

Commit 3e91d32

Browse files
GoodDayForSurfGoodDayForSurf
committed
Merge branch '25_2_demos_vue_ts_scheduler' of https://github.com/GoodDayForSurf/DevExtreme into 25_2_demos_vue_ts_scheduler
2 parents 58f0f7e + 6e210b5 commit 3e91d32

File tree

5 files changed

+44
-73
lines changed

5 files changed

+44
-73
lines changed

‎.github/workflows/pr-filter-stubs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ jobs:
123123
steps:
124124
- run: exit 1
125125
qunit_tests4:
126-
name: 'Constel ui.widgets(1/2)'
126+
name: 'Constel ui.widgets(1/2)-no-csp'
127127
needs: [ changesSegregation ]
128128
if: false
129129
runs-on: ubuntu-latest
130130
steps:
131131
- run: exit 1
132132
qunit_tests5:
133-
name: 'Constel ui.widgets(2/2)'
133+
name: 'Constel ui.widgets(2/2)-no-csp'
134134
needs: [ changesSegregation ]
135135
if: false
136136
runs-on: ubuntu-latest

‎.github/workflows/qunit_tests-additional-renovation.yml‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -72,42 +72,6 @@ jobs:
7272
path: packages/devextreme/artifacts.zip
7373
retention-days: 1
7474

75-
qunit-tests-timezones:
76-
needs: build
77-
runs-on: devextreme-shr2
78-
name: ${{ matrix.constel }}-${{ matrix.timezone }}
79-
timeout-minutes: 25
80-
strategy:
81-
fail-fast: false
82-
matrix:
83-
constel: [
84-
'misc(1/2)',
85-
'misc(2/2)',
86-
'ui.editors(1/2)',
87-
'ui.editors(2/2)',
88-
'ui.grid(1/2)',
89-
'ui.grid(2/2)',
90-
'ui.scheduler(1/3)',
91-
'ui.scheduler(2/3)',
92-
'ui.scheduler(3/3)'
93-
]
94-
timezone: [ 'US/Pacific', 'Japan', 'Australia/ACT', 'Europe/London' ]
95-
96-
steps:
97-
- name: Get sources
98-
uses: actions/checkout@v4
99-
100-
- name: Run QUnit tests
101-
uses: ./.github/actions/run-qunit-tests
102-
with:
103-
name: ${{ matrix.constel }}-${{ matrix.timezone }}
104-
constel: ${{ matrix.constel }}
105-
browser: 'chrome'
106-
timezone: ${{ matrix.timezone }}
107-
headless: 'true'
108-
useJQuery: 'false'
109-
useCsp: 'true'
110-
11175
qunit-tests-mobile-and-shadow-dom:
11276
needs: build
11377
runs-on: devextreme-shr2
@@ -221,39 +185,13 @@ jobs:
221185
headless: 'true'
222186
useCsp: 'true'
223187

224-
qunit-tests-no-csp:
225-
needs: build
226-
runs-on: devextreme-shr2
227-
name: ${{ matrix.constel }}-no-csp
228-
timeout-minutes: 25
229-
strategy:
230-
fail-fast: false
231-
matrix:
232-
constel: [ 'misc(1/2)', 'misc(2/2)' ]
233-
234-
steps:
235-
- name: Get sources
236-
uses: actions/checkout@v4
237-
238-
- name: Run QUnit tests
239-
uses: ./.github/actions/run-qunit-tests
240-
with:
241-
name: ${{ matrix.constel }}-no-csp
242-
constel: ${{ matrix.constel }}
243-
browser: 'chrome'
244-
useJQuery: 'true'
245-
headless: 'true'
246-
useCsp: 'false'
247-
248188
notify:
249189
runs-on: devextreme-shr2
250190
name: Send notifications
251191
needs: [
252192
build,
253-
qunit-tests-timezones,
254193
qunit-tests-mobile-and-shadow-dom,
255194
qunit-tests-firefox,
256-
qunit-tests-no-csp
257195
]
258196
if: github.event_name != 'pull_request' && contains(needs.*.result, 'failure')
259197

.github/workflows/qunit_tests-renovation.yml renamed to .github/workflows/qunit_tests.yml

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: QUnit tests for renovation
1+
name: QUnit tests
22

33
concurrency:
44
group: wf-${{github.event.pull_request.number || github.sha}}-${{github.workflow}}
@@ -50,7 +50,7 @@ jobs:
5050
${{ runner.os }}-pnpm-store
5151
5252
- name: Install dependencies
53-
run: pnpm install
53+
run: pnpm install --frozen-lockfile
5454

5555
- name: Build
5656
working-directory: ./packages/devextreme
@@ -59,8 +59,7 @@ jobs:
5959
DEVEXTREME_TEST_CI: "true"
6060
DOTNET_CLI_TELEMETRY_OPTOUT: "true"
6161
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: "true"
62-
BUILD_INPROGRESS_RENOVATION: "true"
63-
run: pnpx nx build:dev
62+
run: pnpx nx build:systemjs
6463

6564
- name: Zip artifacts
6665
working-directory: ./packages/devextreme
@@ -77,12 +76,37 @@ jobs:
7776
qunit-tests:
7877
needs: build
7978
runs-on: devextreme-shr2
80-
name: Constel ${{ matrix.CONSTEL }}
79+
name: Constel ${{ matrix.CONSTEL }}${{ matrix.TIMEZONE != '' && format('-{0}', matrix.TIMEZONE) || '' }}${{ matrix.CSP == 'false' && '-no-csp' || '' }}
8180
timeout-minutes: 60
8281
strategy:
8382
fail-fast: false
8483
matrix:
85-
CONSTEL: [ export, misc, ui, ui.widgets(1/2), ui.widgets(2/2), ui.editors, ui.htmlEditor, ui.grid, ui.scheduler(1/2), ui.scheduler(2/2), viz ]
84+
CONSTEL: [
85+
export,
86+
misc,
87+
ui,
88+
ui.editors,
89+
ui.htmlEditor,
90+
ui.grid,
91+
ui.scheduler(1/2),
92+
ui.scheduler(2/2),
93+
viz
94+
]
95+
TIMEZONE: ['']
96+
CSP: ['true']
97+
useJQuery: ['false']
98+
include:
99+
- CONSTEL: ui.scheduler(1/2)
100+
TIMEZONE: US/Pacific
101+
- CONSTEL: ui.scheduler(2/2)
102+
TIMEZONE: US/Pacific
103+
- CONSTEL: misc
104+
CSP: 'false'
105+
useJQuery: 'true'
106+
- CONSTEL: ui.widgets(1/2)
107+
CSP: 'false'
108+
- CONSTEL: ui.widgets(2/2)
109+
CSP: 'false'
86110

87111
steps:
88112
- name: Get sources
@@ -91,9 +115,11 @@ jobs:
91115
- name: Run QUnit tests
92116
uses: ./.github/actions/run-qunit-tests
93117
with:
94-
name: Constel ${{ matrix.CONSTEL }}
118+
name: Constel ${{ matrix.CONSTEL }}${{ matrix.TIMEZONE != '' && format('-{0}', matrix.TIMEZONE) || '' }}${{ matrix.CSP == 'false' && '-no-csp' || '' }}
95119
constel: ${{ matrix.CONSTEL }}
96-
useCsp: "false"
120+
timezone: ${{ matrix.TIMEZONE }}
121+
useJQuery: ${{ matrix.useJQuery }}
122+
useCsp: ${{ matrix.CSP }}
97123

98124
notify:
99125
runs-on: devextreme-shr2

‎apps/demos/Demos/SpeechToText/Overview/description.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Our DevExtreme [SpeechToText](/Documentation/ApiReference/UI_Components/dxSpeechToText) component allows you to integrate voice input into your app. The component implements the [Web Speech API SpeechRecognition](https://developer.mozilla.org/en-US/docs/Web/API/SpeechRecognition) interface and supports [custom speech recognizers](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#customSpeechRecognizer).
2+
3+
<!--split-->
4+
5+
You can integrate SpeechToText with any text input, including other [DevExtreme components](https://js.devexpress.com/jQuery/Demos/WidgetsGallery/). To do this, set a component's **value** property to the transcribed text. SpeechToText returns transcribed text in the [onResult](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#onResult) handler as users speak. When speech stops, the component calls the [onEnd](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#onEnd) handler and switches from the "listening" state to the initial state. SpeechToText implements different icon ([startIcon](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#startIcon)/[stopIcon](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#stopIcon)), text ([startText](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#startText)/[stopText](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#stopText)), and click handler ([onStartClick](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#onStartClick)/[onStopClick](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/#onStopClick)) properties in each component state.
6+
7+
For a complete overview of SpeechToText options (including [Web Speech API options](/Documentation/ApiReference/UI_Components/dxSpeechToText/Configuration/speechRecognitionConfig/)), refer to the following topic: [SpeechToText API Reference](/Documentation/ApiReference/UI_Components/dxSpeechToText/).

‎packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ QUnit.module('keyboard navigation', {
11191119
assert.equal(tabsFocusedIndex, $(this.instance.option('focusedElement')).index(), 'multiView focused element is equal tabs focused element');
11201120
});
11211121

1122-
QUnit.test('looping should work on keyboard navigation after loop runtime change to true and swipe', function(assert) {
1122+
QUnit.skip('looping should work on keyboard navigation after loop runtime change to true and swipe', function(assert) {
11231123
if(shouldSkipOnMobile(assert, 'there is no keyboard navigation on mobile devices')) {
11241124
return;
11251125
}

0 commit comments

Comments
 (0)