Skip to content

Commit 625ab14

Browse files
committed
refactor(*): Adding wrapping containers for some renderers
1 parent 9bbf2ed commit 625ab14

File tree

4 files changed

+40
-25
lines changed

4 files changed

+40
-25
lines changed

src/components/chat/chat-input.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,16 @@ export default class IgcChatInputComponent extends LitElement {
334334
const ctx: ChatRenderContext = { instance: this._state.host };
335335

336336
return html`
337-
${this._getRenderer('fileUploadButton')(ctx)}
338-
${this._getRenderer('inputActionsStart')(ctx)}
339-
${this._getRenderer('sendButton')(ctx)}
340-
${this._getRenderer('inputActionsEnd')(ctx)}
337+
<div part="file-upload">
338+
${this._getRenderer('fileUploadButton')(ctx)}
339+
</div>
340+
<div part="input-actions-start">
341+
${this._getRenderer('inputActionsStart')(ctx)}
342+
</div>
343+
<div part="send-button">${this._getRenderer('sendButton')(ctx)}</div>
344+
<div part="input-actions-end">
345+
${this._getRenderer('inputActionsEnd')(ctx)}
346+
</div>
341347
`;
342348
}
343349

src/components/chat/chat-message.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,10 @@ export default class IgcChatMessageComponent extends LitElement {
266266
${cache(
267267
this.message
268268
? html`
269-
<div part=${partMap(parts)}>
269+
<div
270+
part=${partMap(parts)}
271+
exportparts="attachment: message-attachment, attachments-container: message-attachments-container"
272+
>
270273
${cache(
271274
messageRenderer ? messageRenderer(ctx) : this._renderMessage()
272275
)}

src/components/chat/chat.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ export default class IgcChatComponent extends EventEmitterMixin<
386386
id=${`message-${message.id}`}
387387
part="message-item"
388388
.message=${message}
389-
exportparts="message-container, message-text, message-attachments, message-actions, sent,
390-
attachments-container, attachment, attachment-header, attachment-content, attachment-icon, file-name, actions: attachment-actions"
389+
exportparts="message-container, message-text, message-attachments-container, message-attachment, message-actions, sent,
390+
attachment, attachment-header, attachment-content, attachment-icon, file-name, actions: attachment-actions"
391391
>
392392
</igc-chat-message>
393393
`;
@@ -489,7 +489,8 @@ export default class IgcChatComponent extends EventEmitterMixin<
489489
message-item,
490490
message,
491491
message-text,
492-
message-attachments,
492+
message-attachment,
493+
message-attachments-container,
493494
message-actions,
494495
typing-indicator,
495496
attachments-container,
@@ -499,7 +500,11 @@ export default class IgcChatComponent extends EventEmitterMixin<
499500
attachment-icon,
500501
file-name,
501502
attachment-actions,
502-
sent
503+
sent,
504+
file-upload,
505+
input-actions-start,
506+
input-actions-end,
507+
send-button
503508
"
504509
>
505510
${this._renderHeader()}

src/components/chat/message-attachments.ts

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,7 @@ export default class IgcMessageAttachmentsComponent extends LitElement {
139139

140140
private _renderAttachment(attachment: IgcChatMessageAttachment) {
141141
const isCurrentUser = this._state.isCurrentUserMessage(this.message);
142-
const attachmentParts = {
143-
attachment: true,
144-
sent: isCurrentUser,
145-
};
142+
146143
const contentParts = {
147144
'attachment-content': true,
148145
sent: isCurrentUser,
@@ -172,16 +169,18 @@ export default class IgcMessageAttachmentsComponent extends LitElement {
172169
</div>`;
173170

174171
return html`
175-
<div part=${partMap(attachmentParts)}>
176-
${isCurrentUser ? content : nothing} ${header}
177-
${!isCurrentUser ? content : nothing}
178-
</div>
172+
${isCurrentUser ? content : nothing} ${header}
173+
${!isCurrentUser ? content : nothing}
179174
`;
180175
}
181176

182177
protected override render() {
183178
const attachments = this.message?.attachments ?? [];
184-
179+
const isCurrentUser = this._state.isCurrentUserMessage(this.message);
180+
const attachmentParts = {
181+
attachment: true,
182+
sent: isCurrentUser,
183+
};
185184
return html`${cache(
186185
this.message
187186
? html`
@@ -190,13 +189,15 @@ export default class IgcMessageAttachmentsComponent extends LitElement {
190189
attachments,
191190
(attachment) => attachment.id,
192191
(attachment) => html`
193-
${until(
194-
this._getRenderer('attachment')({
195-
attachment,
196-
message: this.message!,
197-
instance: this._state.host,
198-
})
199-
)}
192+
<div part="${partMap(attachmentParts)}">
193+
${until(
194+
this._getRenderer('attachment')({
195+
attachment,
196+
message: this.message!,
197+
instance: this._state.host,
198+
})
199+
)}
200+
</div>
200201
`
201202
)}
202203
</div>

0 commit comments

Comments
 (0)