Skip to content

fix: use grid instead of virtual-list #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: use grid instead of virtual-list #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/main/java/com/flowingcode/vaadin/addons/chatassistant/ChatAssistant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.dependency.JsModule;
import com.vaadin.flow.component.dependency.NpmPackage;
import com.vaadin.flow.component.grid.Grid;
import com.vaadin.flow.component.grid.GridVariant;
import com.vaadin.flow.component.html.Span;
import com.vaadin.flow.component.icon.Icon;
import com.vaadin.flow.component.icon.VaadinIcon;
Expand All @@ -39,13 +41,11 @@
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.popover.Popover;
import com.vaadin.flow.component.react.ReactAdapterComponent;
import com.vaadin.flow.component.virtuallist.VirtualList;
import com.vaadin.flow.data.provider.DataProvider;
import com.vaadin.flow.data.renderer.ComponentRenderer;
import com.vaadin.flow.data.renderer.Renderer;
import com.vaadin.flow.function.SerializableSupplier;
import com.vaadin.flow.shared.Registration;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -69,13 +69,14 @@
@CssImport("./styles/chat-assistant-styles.css")
public class ChatAssistant<T extends Message> extends ReactAdapterComponent implements ClickNotifier<ChatAssistant<T>> {

private static final String CHAT_ASSISTANT_GRID_COMPACT = "chat-assistant-grid-compact";

private static final String CHAT_HEADER_CLASS_NAME = "chat-header";
private static final String PADDING_SMALL = "0.5em";

private Component headerComponent;
private VerticalLayout container;
private Component footerContainer;
private VirtualList<T> content = new VirtualList<>();
private Grid<T> content = new Grid<>();
private Popover chatWindow;
private List<T> messages;
private MessageInput messageInput;
Expand Down Expand Up @@ -149,7 +150,10 @@ private void initializeFooter() {

@SuppressWarnings("unchecked")
private void initializeContent(boolean markdownEnabled) {
content.setRenderer(new ComponentRenderer<>(message -> new ChatMessage<T>(message, markdownEnabled),
content.addThemeVariants(GridVariant.LUMO_NO_BORDER);
content.addThemeVariants(GridVariant.LUMO_NO_ROW_BORDERS);
content.setClassName(CHAT_ASSISTANT_GRID_COMPACT);
content.addColumn(m->m.getContent()).setKey("content").setRenderer(new ComponentRenderer<>(message -> new ChatMessage<T>(message, markdownEnabled),
(component, message) -> {
((ChatMessage<T>) component).setMessage(message);
return component;
Expand Down Expand Up @@ -381,7 +385,7 @@ public void scrollToEnd() {
*/
public void setMessagesRenderer(Renderer<T> renderer) {
Objects.requireNonNull(renderer, "Renderer cannot not be null");
content.setRenderer(renderer);
content.getColumnByKey("content").setRenderer(renderer);
}

/**
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/META-INF/frontend/styles/chat-assistant-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ vaadin-popover-overlay::part(overlay) {
max-height: 100vh; /* Prevent height beyond viewport */
}

vaadin-grid.chat-assistant-grid-compact vaadin-grid-cell-content {
padding: 0px;
}

/* Mobile breakpoint */
@media (max-width: 768px) {
vaadin-popover-overlay::part(overlay) {
Expand Down