Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions resources/js/show/components/fields/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@

const props = defineProps<ShowFieldProps<ShowDashboardFieldData> & { ariaLabelledby?: string }>();

const collapsed = ref(props.collapsable);
const remembered = useRemember({
data: null as DashboardData | null,
collapsed: props.collapsable,
}, `dashboard_${props.field.key}`);
const collapsed = ref(props.collapsable && remembered.value.collapsed);
const dashboard: Ref<Dashboard | null> = ref(null);
const filters: FilterManager = useFilters();
const reload: CommandResponseHandlers['reload'] = (data, { formModal }) => {
Expand All @@ -42,10 +46,6 @@
reload({ action: 'reload' }, { formModal });
},
});
const remembered = useRemember({
data: null as DashboardData | null,
collapsed: collapsed.value, // TODO handle remembered collapse state
}, `dashboard_${props.field.key}`);


if(remembered.value.data && !collapsed.value) {
Expand Down
10 changes: 5 additions & 5 deletions resources/js/show/components/fields/EntityList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
const props = defineProps<ShowFieldProps<ShowEntityListFieldData> & { highlightedInstanceId?: string | number, ariaLabelledby?: string }>();

const el = ref();
const collapsed = ref(props.collapsable && !props.highlightedInstanceId);
const remembered = useRemember({
data: null as EntityListData | null,
collapsed: props.collapsable,
}, `entityList_${props.field.key}`);
const collapsed = ref(props.collapsable && !props.highlightedInstanceId && remembered.value.collapsed);
const entityList: Ref<EntityList | null> = ref(null);
const filters: FilterManager = useFilters();
const commands = useCommands('entityList', {
Expand All @@ -41,10 +45,6 @@
formModal.shouldReopen && formModal.reopen();
},
});
const remembered = useRemember({
data: null as EntityListData | null,
collapsed: collapsed.value, // TODO handle remembered collapse state
}, `entityList_${props.field.key}`);


if(remembered.value.data && !collapsed.value) {
Expand Down
Loading