Merge pull request #100 from eldrickb/dev

Fix weekly-view for new Notion databases
This commit is contained in:
Tom 2022-11-25 14:31:48 +11:00 committed by GitHub
commit d4a595a6ec

View File

@ -9,7 +9,9 @@
export default async function ({ web }, db) { export default async function ({ web }, db) {
const pageSelector = '.notion-page-content', const pageSelector = '.notion-page-content',
calendarSelector = '.notion-calendar-view', calendarSelector = '.notion-calendar-view',
viewSelector = '.notion-collection-view-select:not([data-weekly-view])', viewSelector =
'.notion-page-content > .notion-selectable.notion-collection_view-block',
viewControlSelector = ':scope>div>div>div>div>div',
todaySelector = '.notion-calendar-view-day[style*="background"]', todaySelector = '.notion-calendar-view-day[style*="background"]',
weekSelector = '[style^="position: relative; display: flex; height: "]', weekSelector = '[style^="position: relative; display: flex; height: "]',
toolbarBtnSelector = toolbarBtnSelector =
@ -17,8 +19,28 @@ export default async function ({ web }, db) {
const transformCalendarView = () => { const transformCalendarView = () => {
const $page = document.querySelector(pageSelector); const $page = document.querySelector(pageSelector);
document.querySelectorAll(viewSelector).forEach(async ($view) => { document.querySelectorAll(viewSelector).forEach(async ($view) => {
if ($view.innerText.toLowerCase() !== 'weekly') return; let currentText;
// Get view controls children nodes, convert to array, filter out non-text
const $viewNodes = []
.slice.call($view.querySelector(viewControlSelector).children)
.filter(node => node.tagName.toLowerCase().match(/(div|span)/g));
// Find current view by analyzing children (which changes on viewport)
if ($viewNodes.length === 1)
{
// Mobile: Simple dropdown button (like legacy), text is current view
currentText = $viewNodes[0].innerText.toLowerCase();
} else {
// Wide/Desktop: Tabs listed, current view indicated by border style
currentText = $viewNodes
// Find selected view by border style (possibly fragile)
.filter(($e) => $e.children[0].style.borderBottomWidth.toString() === '2px')[0]
.innerText.toLowerCase();
}
if (currentText !== 'weekly') return;
const $calendar = $view.parentElement.parentElement.parentElement.parentElement; const $calendar = $view.parentElement.parentElement.parentElement.parentElement;
if (!$calendar.querySelector(todaySelector)) { if (!$calendar.querySelector(todaySelector)) {
$calendar.querySelector(toolbarBtnSelector).click(); $calendar.querySelector(toolbarBtnSelector).click();
@ -26,7 +48,10 @@ export default async function ({ web }, db) {
await new Promise((res, rej) => requestAnimationFrame(res)); await new Promise((res, rej) => requestAnimationFrame(res));
if ($page) { if ($page) {
for (const $week of $calendar.querySelectorAll(weekSelector)) { for (const $week of $calendar.querySelectorAll(weekSelector)) {
if (!$week.querySelector(todaySelector)) $week.style.height = '0'; if (!$week.querySelector(todaySelector)) {
$week.style.height = 0;
$week.style.visibility = 'hidden';
}
} }
} else { } else {
const $weekContainer = $calendar.querySelector(weekSelector).parentElement; const $weekContainer = $calendar.querySelector(weekSelector).parentElement;
@ -36,7 +61,7 @@ export default async function ({ web }, db) {
break; break;
} else { } else {
$week.style.height = '0'; $week.style.height = '0';
$week.style.opacity = '0'; $week.style.visibility = 'hidden';
} }
} }
} }