Skip to content

Commit a365471

Browse files
committed
Updated to lit 3
1 parent 60f5c70 commit a365471

File tree

37 files changed

+1146
-968
lines changed

37 files changed

+1146
-968
lines changed

babel.config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[
2121
"@babel/plugin-proposal-decorators",
2222
{
23-
"version": "2018-09",
23+
"version": "2023-05",
2424
"decoratorsBeforeExport": true
2525
}
2626
],
@@ -42,4 +42,4 @@
4242
}
4343
]
4444
]
45-
}
45+
}

package-lock.json

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

package.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@
2626
"license": "Apache-2.0",
2727
"devDependencies": {
2828
"@alienfast/i18next-loader": "^2.0.2",
29-
"@babel/cli": "^7.23.4",
30-
"@babel/core": "^7.23.5",
31-
"@babel/plugin-proposal-decorators": "^7.23.5",
32-
"@babel/plugin-transform-class-properties": "^7.23.3",
33-
"@babel/plugin-transform-object-rest-spread": "^7.23.4",
34-
"@babel/plugin-transform-runtime": "^7.23.4",
35-
"@babel/preset-env": "^7.23.5",
36-
"@babel/preset-typescript": "^7.23.3",
29+
"@babel/cli": "^7.24.6",
30+
"@babel/core": "^7.24.6",
31+
"@babel/plugin-proposal-decorators": "^7.24.6",
32+
"@babel/plugin-transform-class-properties": "^7.24.6",
33+
"@babel/plugin-transform-object-rest-spread": "^7.24.6",
34+
"@babel/plugin-transform-runtime": "^7.24.6",
35+
"@babel/preset-env": "^7.24.6",
36+
"@babel/preset-typescript": "^7.24.6",
3737
"@open-wc/building-rollup": "^3.0.2",
3838
"@open-wc/testing": "^4.0.0",
3939
"@rollup/plugin-commonjs": "^25.0.8",
4040
"@rollup/plugin-replace": "^5.0.5",
41+
"@types/mocha": "^10.0.6",
4142
"@types/node": "^20.12.13",
4243
"@typescript-eslint/eslint-plugin": "^7.11.0",
4344
"@typescript-eslint/parser": "^7.11.0",
@@ -48,19 +49,20 @@
4849
"babel-loader": "^9.1.3",
4950
"clean-css": "^5.3.3",
5051
"copy-webpack-plugin": "^12.0.2",
51-
"css-loader": "^6.8.1",
52+
"css-loader": "^7.1.2",
5253
"esbuild-plugin-babel": "^0.2.3",
5354
"esbuild-plugin-copy": "^2.1.1",
5455
"esbuild-plugin-lit-css": "^3.0.0",
5556
"esbuild-plugin-umd-wrapper": "^2.0.0",
5657
"eslint": "^8.57.0",
5758
"eslint-plugin-lit": "^1.14.0",
5859
"jspdf": "^2.5.1",
59-
"lit-css-loader": "^2.0.1",
60+
"lit-css-loader": "^3.0.0",
6061
"mini-css-extract-plugin": "^2.9.0",
6162
"rollup-plugin-lit-css": "^5.0.0",
62-
"style-loader": "^3.3.3",
63+
"style-loader": "^4.0.0",
6364
"terser-webpack-plugin": "^5.3.10",
65+
"ts-lit-plugin": "^2.0.2",
6466
"typescript": "^5.4.5",
6567
"webpack": "^5.91.0",
6668
"webpack-cli": "^5.1.4",
@@ -73,7 +75,7 @@
7375
"i18next": "^23.11.5",
7476
"i18next-browser-languagedetector": "^8.0.0",
7577
"janus-gateway": "^1.2.3",
76-
"lit": "^2.8.0",
78+
"lit": "^3.1.3",
7779
"mobx": "^6.12.3",
7880
"pdfjs-dist": "^4.3.136",
7981
"typescript-event-target": "^1.1.1"

src/component/chat-box/chat-box.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ export class ChatBox extends Component {
2121
chatBoxStyles,
2222
];
2323

24-
@property()
25-
chatService: ChatService;
24+
@property({ attribute: false })
25+
accessor chatService: ChatService;
2626

2727
@query(".chat-history-log")
28-
messageContainer: HTMLElement;
28+
accessor messageContainer: HTMLElement;
2929

3030
@query("chat-form")
31-
chatForm: ChatForm;
31+
accessor chatForm: ChatForm;
3232

3333
messageObserver: IntersectionObserver;
3434

@@ -136,7 +136,7 @@ export class ChatBox extends Component {
136136
${when(privilegeStore.canReadMessages(), () => html`
137137
${repeat(chatStore.messages, (message) => message.messageId, (message) => html`
138138
${when(!message.deleted, () => html`
139-
<chat-box-message .message="${message}" .chatService="${this.chatService}" .chatForm="${this.renderRoot.querySelector("chat-form")}"></chat-box-message>
139+
<chat-box-message .message="${message}" .chatService="${this.chatService}" .chatForm="${this.renderRoot.querySelector<ChatForm>("chat-form")}"></chat-box-message>
140140
`)}
141141
`)}
142142
`)}
@@ -179,15 +179,15 @@ export class ChatBox extends Component {
179179
private onMessageIntersection(entries: IntersectionObserverEntry[]) {
180180
for (const entry of entries) {
181181
if (entry.isIntersecting) {
182-
// Message is visible to the user. Mark it as read.
182+
// The Message is visible to the user. Mark it as read.
183183
const message = (entry.target as ChatBoxMessage).message;
184184
message.read = true;
185185

186-
// Not necessary to observe any more.
186+
// Not necessary to observe anymore.
187187
this.messageObserver.unobserve(entry.target);
188188
}
189189
else {
190-
// Message was added to the container but is not visible.
190+
// The Message was added to the container but is not visible.
191191
if (chatStore.unreadMessages < 2) {
192192
// Show the recent message only if there are no other unread messages left.
193193
this.messageContainer.scrollTo({ top: this.messageContainer.scrollHeight, left: 0, behavior: "smooth" });

src/component/chat-box/chat-message.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,35 @@ export class ChatBoxMessage extends Component {
2020
chatMessageStyles,
2121
];
2222

23-
@property()
24-
message: ChatMessage;
23+
@property({ type: Object })
24+
accessor message: ChatMessage;
2525

26-
@property()
27-
chatService: ChatService;
26+
@property({ type: Object })
27+
accessor chatService: ChatService;
2828

29-
@property()
30-
chatForm: ChatForm;
29+
@property({ type: Object })
30+
accessor chatForm: ChatForm;
3131

3232
@property({ type: Boolean, reflect: true })
33-
myself: boolean;
33+
accessor myself: boolean;
3434

3535
@property({ type: Boolean, reflect: true })
36-
private: boolean;
36+
accessor private: boolean;
3737

3838
@property({ type: Boolean })
39-
editing: boolean = false;
39+
accessor editing: boolean = false;
4040

4141
@property({ type: Boolean, reflect: true })
42-
edited: boolean = false;
42+
accessor edited: boolean = false;
4343

4444
@query('#delete-tooltip')
45-
deleteTooltip: SlTooltip;
45+
accessor deleteTooltip: SlTooltip;
4646

4747
@query('#edit-tooltip')
48-
editTooltip: SlTooltip;
48+
accessor editTooltip: SlTooltip;
4949

5050
@query(".chat-message-boxed")
51-
chatMessageBoxed: HTMLElement;
51+
accessor chatMessageBoxed: HTMLElement;
5252

5353
editedText: string = "";
5454

src/component/chat-form/chat-form.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ export class ChatForm extends Component {
2020
];
2121

2222
@property({ type: Boolean, reflect: true })
23-
replying: boolean = false;
23+
accessor replying: boolean = false;
2424

25-
@property()
26-
chatService: ChatService;
25+
@property({ attribute: false })
26+
accessor chatService: ChatService;
2727

2828
@query('#recipients')
29-
private recipientSelect: HTMLSelectElement;
29+
private accessor recipientSelect: HTMLSelectElement;
3030

3131
@query('form')
32-
private form: HTMLFormElement;
32+
private accessor form: HTMLFormElement;
3333

3434
private selectedRecipient: string;
3535

src/component/chat-modal/chat.modal.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export class ChatModal extends Modal {
1313
chatModalStyles
1414
];
1515

16-
@property()
17-
chatService: ChatService;
16+
@property({ attribute: false })
17+
accessor chatService: ChatService;
1818

1919

2020
protected override render() {
@@ -26,4 +26,4 @@ export class ChatModal extends Modal {
2626
</sl-dialog>
2727
`;
2828
}
29-
}
29+
}

src/component/conference-view/conference-view.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,49 +33,49 @@ export class ConferenceView extends I18nLitElement {
3333

3434
/** Specifies how many tiles should be shown at a given time. */
3535
@property({ type: Number, attribute: 'tiles-per-page' })
36-
tilesPerPage = 1;
36+
accessor tilesPerPage = 1;
3737

3838
@property({ type: Number, attribute: 'tile-height' })
39-
tileHeight: number;
39+
accessor tileHeight: number;
4040

4141
@property({ type: Number, attribute: 'tile-width' })
42-
tileWidth: number;
42+
accessor tileWidth: number;
4343

44-
@property({ reflect: true })
45-
layout: ContentLayout;
44+
@property({ type: Number, reflect: true })
45+
accessor layout: ContentLayout;
4646

47-
@property({ reflect: true })
48-
contentFocus: ContentFocus;
47+
@property({ type: Number, reflect: true })
48+
accessor contentFocus: ContentFocus;
4949

5050
@state()
51-
gridCounter: number = 0;
51+
accessor gridCounter: number = 0;
5252

5353
@state()
54-
gridColumns: number = 0;
54+
accessor gridColumns: number = 0;
5555

5656
@state()
57-
gridRows: number = 0;
57+
accessor gridRows: number = 0;
5858

59-
@property()
60-
gridElementsLimit: number = 20;
59+
@property({ type: Number })
60+
accessor gridElementsLimit: number = 20;
6161

62-
@property()
63-
columnLimit: number = 5;
62+
@property({ type: Number })
63+
accessor columnLimit: number = 5;
6464

65-
@property()
66-
rowsLimit: number = 3;
65+
@property({ type: Number })
66+
accessor rowsLimit: number = 3;
6767

6868
@property({ type: Boolean, reflect: true })
69-
isSpeaker: boolean = false;
69+
accessor isSpeaker: boolean = false;
7070

7171
@query('.grid-container')
72-
gridContainer: HTMLElement;
72+
accessor gridContainer: HTMLElement;
7373

7474
@query('.presentation-container')
75-
presentationContainer: HTMLElement;
75+
accessor presentationContainer: HTMLElement;
7676

7777
@query("screen-view")
78-
screenView: ScreenView;
78+
accessor screenView: ScreenView;
7979

8080

8181
public addGridElement(view: ParticipantView) {
@@ -436,4 +436,4 @@ export class ConferenceView extends I18nLitElement {
436436
const layout = e.detail;
437437
this.setContentLayout(ContentLayout[layout as keyof typeof ContentLayout]);
438438
}
439-
}
439+
}

src/component/controller/modal.controller.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class ModalController extends Controller {
1515

1616
modal.container = this.context.host.renderRoot;
1717

18-
// Close potentially opened modal of same type to prevent modal overlapping.
18+
// Close potentially opened modal of the same type to prevent modal overlapping.
1919
this.closeModal(name);
2020

2121
this.modals.set(name, modal);
@@ -61,4 +61,4 @@ export class ModalController extends Controller {
6161
hasModalRegistered(name: string) {
6262
return this.modals.has(name);
6363
}
64-
}
64+
}

src/component/controls/audio-volume-button.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ export class AudioVolumeButton extends I18nLitElement {
1515
];
1616

1717
@property({ type: Number, reflect: true })
18-
volume: number = 100;
18+
accessor volume: number = 100;
1919

2020
@property({ type: Number, reflect: true })
21-
volumeState: number;
21+
accessor volumeState: number;
2222

2323
@property({ type: Boolean, reflect: true })
24-
muted: boolean = false;
25-
26-
mutedVolume: number | undefined;
24+
accessor muted: boolean = false;
2725

2826
@query('sl-menu')
29-
menu: SlMenu;
27+
accessor menu: SlMenu;
3028

3129
@query('#button-tooltip')
32-
tooltip: SlTooltip;
30+
accessor tooltip: SlTooltip;
31+
32+
mutedVolume: number | undefined;
3333

3434

3535
protected override firstUpdated(): void {
@@ -117,4 +117,4 @@ export class AudioVolumeButton extends I18nLitElement {
117117
private onButton() {
118118
this.tooltip.hide();
119119
}
120-
}
120+
}

0 commit comments

Comments
 (0)