Skip to content

Commit f5468fe

Browse files
committed
🎨 #15557
1 parent b786163 commit f5468fe

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

app/src/protyle/render/av/gallery/item.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ export const insertGalleryItemAnimation = (options: {
1919
if (hasSort) {
2020
sideItemElement = options.blockElement.querySelector(groupQuery + ".av__gallery-add").previousElementSibling;
2121
}
22+
const bodyElement = options.blockElement.querySelector(`.av__body[data-group-id="${options.groupID}"] `);
23+
if (bodyElement && ["updated", "created"].includes(bodyElement.getAttribute("data-dtype")) &&
24+
bodyElement.getAttribute("data-content") !== "_@today@_") {
25+
sideItemElement = options.blockElement.querySelector('.av__body[data-content="_@today@_"] .av__gallery-add').previousElementSibling;
26+
}
2227
let cellsHTML = "";
2328
sideItemElement?.querySelectorAll(".av__cell").forEach((item: HTMLElement) => {
2429
let lineNumber = 1;

app/src/protyle/render/av/gallery/render.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ const renderGroupGallery = (options: ITableOptions) => {
132132
options.data.view.groups.forEach((group: IAVGallery) => {
133133
if (group.groupHidden === 0) {
134134
avBodyHTML += `${getGroupTitleHTML(group, group.cards.length)}
135-
<div data-group-id="${group.id}" data-page-size="${group.pageSize}" class="av__body${group.groupFolded ? " fn__none" : ""}">${getGalleryHTML(group, options.resetData.selectItemIds, options.resetData.editIds, group.id)}</div>`;
135+
<div data-group-id="${group.id}" data-page-size="${group.pageSize}" data-dtype="${group.groupKey.type}" data-content="${group.groupValue.text.content}" class="av__body${group.groupFolded ? " fn__none" : ""}">${getGalleryHTML(group, options.resetData.selectItemIds, options.resetData.editIds, group.id)}</div>`;
136136
}
137137
});
138138
if (options.renderAll) {

app/src/protyle/render/av/render.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ const renderGroupTable = (options: ITableOptions) => {
261261
options.data.view.groups.forEach((group: IAVTable) => {
262262
if (group.groupHidden === 0) {
263263
avBodyHTML += `${getGroupTitleHTML(group, group.rows.length)}
264-
<div data-group-id="${group.id}" data-page-size="${group.pageSize}" style="float: left" class="av__body${group.groupFolded ? " fn__none" : ""}">${getTableHTMLs(group, options.blockElement)}</div>`;
264+
<div data-group-id="${group.id}" data-page-size="${group.pageSize}" data-dtype="${group.groupKey.type}" data-content="${group.groupValue.text.content}" style="float: left" class="av__body${group.groupFolded ? " fn__none" : ""}">${getTableHTMLs(group, options.blockElement)}</div>`;
265265
}
266266
});
267267
if (options.renderAll) {

app/src/protyle/render/av/row.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ export const insertAttrViewBlockAnimation = (options: {
128128
if (hasSort) {
129129
previousElement = options.blockElement.querySelector(groupQuery + ".av__row--util").previousElementSibling;
130130
}
131+
const bodyElement = options.blockElement.querySelector(`.av__body[data-group-id="${options.groupID}"] `);
132+
if (bodyElement && ["updated", "created"].includes(bodyElement.getAttribute("data-dtype")) &&
133+
bodyElement.getAttribute("data-content") !== "_@today@_") {
134+
previousElement = options.blockElement.querySelector('.av__body[data-content="_@today@_"] .av__row--util').previousElementSibling;
135+
}
131136

132137
let cellsHTML = '<div class="av__colsticky"><div class="av__firstcol"><svg><use xlink:href="#iconUncheck"></use></svg></div></div>';
133138
const pinIndex = previousElement.querySelectorAll(".av__colsticky .av__cell").length - 1;

0 commit comments

Comments
 (0)