Skip to content

Commit

Permalink
merge 24_2
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Arzamasov committed Dec 4, 2024
2 parents fa2ce00 + bc2c1d2 commit 5147929
Show file tree
Hide file tree
Showing 93 changed files with 763 additions and 378 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/demos_visual_tests_frameworks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ jobs:
working-directory: apps/demos
env:
CHANGEDFILEINFOSPATH: changed-files.json
BROWSERS: chrome:headless --disable-gpu --window-size=1200,800 --js-flags=--random-seed=2147483647
BROWSERS: chrome:headless --window-size=1200,800 --disable-partial-raster --disable-skia-runtime-opts --run-all-compositor-stages-before-draw --disable-new-content-rendering-timeout --disable-threaded-animation --disable-threaded-scrolling --disable-checker-imaging --disable-image-animation-resync --use-gl="swiftshader" --disable-features=PaintHolding --js-flags=--random-seed=2147483647 --font-render-hinting=none --disable-font-subpixel-positioning
# DEBUG: hammerhead:*,testcafe:*
CONCURRENCY: 4
TCQUARANTINE: true
Expand Down
119 changes: 62 additions & 57 deletions apps/demos/Demos/Chat/Overview/Vue/App.vue
Original file line number Diff line number Diff line change
@@ -1,62 +1,67 @@
<template>
<DxChat
v-model:items="messages"
v-model:user="currentUser"
v-model:typing-users="userChatTypingUsers"
@message-entered="onMessageEntered($event)"
@typing-start="userChatTypingStart()"
@typing-end="userChatTypingEnd()"
></DxChat>
<DxChat
v-model:items="messages"
v-model:user="supportAgent"
v-model:typing-users="supportChatTypingUsers"
@message-entered="onMessageEntered($event)"
@typing-start="supportChatTypingStart()"
@typing-end="supportChatTypingEnd()"
></DxChat>
<DxChat
v-model:items="messages"
v-model:user="currentUser"
v-model:typing-users="userChatTypingUsers"
@message-entered="onMessageEntered($event)"
@typing-start="userChatTypingStart()"
@typing-end="userChatTypingEnd()"
/>
<DxChat
v-model:items="messages"
v-model:user="supportAgent"
v-model:typing-users="supportChatTypingUsers"
@message-entered="onMessageEntered($event)"
@typing-start="supportChatTypingStart()"
@typing-end="supportChatTypingEnd()"
/>
</template>

<style scoped>
#app {
display: flex;
gap: 20px;
}
.dx-chat {
height: 710px;
}
.dx-avatar {
border: 1px solid var(--dx-color-border);
}
</style>

<script setup lang="ts">
import { ref } from 'vue';
import DxChat from 'devextreme-vue/chat';
import { messages, supportAgent, currentUser } from './data.ts';
const userChatTypingUsers = ref([]);
const supportChatTypingUsers = ref([]);
function onMessageEntered(event) {
messages.value = [...messages.value, event.message];
}
function userChatTypingStart() {
supportChatTypingUsers.value = [currentUser.value];
}
function userChatTypingEnd() {
supportChatTypingUsers.value = [];
}
function supportChatTypingStart() {
userChatTypingUsers.value = [supportAgent.value];
}
function supportChatTypingEnd() {
userChatTypingUsers.value = [];
}
import { ref } from 'vue';
import DxChat from 'devextreme-vue/chat';
import {
messages as initialMessages,
supportAgent,
currentUser,
} from './data.ts';
const messages = ref(initialMessages);
const userChatTypingUsers = ref([]);
const supportChatTypingUsers = ref([]);
function onMessageEntered(event) {
messages.value = [...messages.value, event.message];
}
function userChatTypingStart() {
supportChatTypingUsers.value = [currentUser];
}
function userChatTypingEnd() {
supportChatTypingUsers.value = [];
}
function supportChatTypingStart() {
userChatTypingUsers.value = [supportAgent];
}
function supportChatTypingEnd() {
userChatTypingUsers.value = [];
}
</script>

<style scoped>
#app {
display: flex;
gap: 20px;
}
.dx-chat {
height: 710px;
}
.dx-avatar {
border: 1px solid var(--dx-color-border);
}
</style>
10 changes: 10 additions & 0 deletions apps/demos/Demos/Pagination/Overview/description.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
DevExpress Pagination UI component allows users to navigate between pages and adjust page size at runtime. The Pagination component in this demo allows users to browse employee cards.

To set up a Pagination component, specify the following options:

- [itemCount](/Documentation/ApiReference/UI_Components/dxPagination/Configuration/#itemCount): the total number of elements in the target control.
- [pageSize](/Documentation/ApiReference/UI_Components/dxPagination/Configuration/#pageSize): the number of items per page.
- [allowedPageSizes](/Documentation/ApiReference/UI_Components/dxPagination/Configuration/#allowedPageSizes) : available page size choices.
- [pageIndex](/Documentation/ApiReference/UI_Components/dxPagination/Configuration/#pageIndex): page displayed first.
- [showNavigationButtons](/Documentation/ApiReference/UI_Components/dxPagination/Configuration/#showNavigationButtons): navigation button visibility.
- [showInfo](/Documentation/ApiReference/UI_Components/dxPagination/Configuration/#showInfo): information pane visibility.
12 changes: 6 additions & 6 deletions apps/demos/Demos/Popup/Overview/Angular/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,27 @@
container=".dx-viewport"
[(visible)]="popupVisible"
>
<dxi-toolbar-item
<dxi-popup-toolbar-item
widget="dxButton"
toolbar="top"
locateInMenu="always"
[options]="moreInfoButtonOptions"
>
</dxi-toolbar-item>
<dxi-toolbar-item
</dxi-popup-toolbar-item>
<dxi-popup-toolbar-item
widget="dxButton"
toolbar="bottom"
location="before"
[options]="emailButtonOptions"
>
</dxi-toolbar-item>
<dxi-toolbar-item
</dxi-popup-toolbar-item>
<dxi-popup-toolbar-item
widget="dxButton"
toolbar="bottom"
location="after"
[options]="closeButtonOptions"
>
</dxi-toolbar-item>
</dxi-popup-toolbar-item>
<dxo-position at="bottom" my="center" [of]="positionOf" collision="fit">
</dxo-position>
<div *dxTemplate="let data of 'content'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
</div>
</div>
</div>
<dxi-toolbar-item
<dxi-popup-toolbar-item
widget="dxButton"
toolbar="bottom"
location="center"
[options]="bookButtonOptions"
>
</dxi-toolbar-item>
</dxi-popup-toolbar-item>
</dx-popup>

<dx-popup
Expand Down Expand Up @@ -102,11 +102,11 @@
</div>
</dx-scroll-view>
</div>
<dxi-toolbar-item
<dxi-popup-toolbar-item
widget="dxButton"
toolbar="bottom"
location="center"
[options]="bookButtonOptions"
>
</dxi-toolbar-item>
</dxi-popup-toolbar-item>
</dx-popup>
Loading

0 comments on commit 5147929

Please sign in to comment.