Skip to content
Draft
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
1 change: 1 addition & 0 deletions src/Forms.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
:form="selectedForm"
:sidebarOpened="sidebarOpened"
:active="sidebarActive"
@update:form="updateSelectedForm"
@update:sidebarOpened="sidebarOpened = $event"
@update:active="sidebarActive = $event" />
</template>
Expand Down
90 changes: 49 additions & 41 deletions src/FormsSubmit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type { FormsForm } from './models/Entities.d.ts'
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import { loadState } from '@nextcloud/initial-state'
import { defineComponent } from 'vue'
import { nextTick, onMounted, onUnmounted } from 'vue'
import NcContent from '@nextcloud/vue/components/NcContent'
import Submit from './views/Submit.vue'

Expand All @@ -33,45 +34,14 @@ export default defineComponent({
Submit,
},

data() {
return {
form: loadState(formsAppName, 'form') as FormsForm,
isLoggedIn: loadState(formsAppName, 'isLoggedIn') as boolean,
isEmbedded: loadState(formsAppName, 'isEmbedded', false) as boolean,
shareHash: loadState(formsAppName, 'shareHash') as string,
}
},

unmounted() {
unsubscribe('forms:last-updated:set', this.onSubmitMessageEvent)
},

mounted() {
if (this.isEmbedded) {
subscribe('forms:last-updated:set', this.onSubmitMessageEvent)

// Communicate window size to parent window in iframes
const resizeObserver = new ResizeObserver((entries) => {
this.emitResizeMessage(entries[0].target as HTMLElement)
})
this.$nextTick(() => {
const formEl = document.querySelector('.app-forms-embedded form')
if (formEl) {
resizeObserver.observe(formEl)
}
})
}
},
setup() {
const form = loadState(formsAppName, 'form') as FormsForm
const isLoggedIn = loadState(formsAppName, 'isLoggedIn') as boolean
const isEmbedded = loadState(formsAppName, 'isEmbedded', false) as boolean
const shareHash = loadState(formsAppName, 'shareHash') as string
let resizeObserver: ResizeObserver | undefined

methods: {
onSubmitMessageEvent(event: unknown): void {
const id = Number(event)
if (Number.isFinite(id)) {
this.emitSubmitMessage(id)
}
},

emitSubmitMessage(id: number): void {
const emitSubmitMessage = (id: number): void => {
window.parent?.postMessage(
{
type: 'form-saved',
Expand All @@ -81,12 +51,19 @@ export default defineComponent({
},
'*',
)
},
}

const onSubmitMessageEvent = (event: unknown): void => {
const id = Number(event)
if (Number.isFinite(id)) {
emitSubmitMessage(id)
}
}

/**
* @param target Target of which the size should be communicated
*/
emitResizeMessage(target: HTMLElement): void {
const emitResizeMessage = (target: HTMLElement): void => {
const rect = target.getBoundingClientRect()
let height = rect.top + target.scrollHeight
let width = target.scrollWidth
Expand Down Expand Up @@ -117,7 +94,38 @@ export default defineComponent({
},
'*',
)
},
}

onMounted(() => {
if (!isEmbedded) {
return
}

subscribe('forms:last-updated:set', onSubmitMessageEvent)

// Communicate window size to parent window in iframes
resizeObserver = new ResizeObserver((entries) => {
emitResizeMessage(entries[0].target as HTMLElement)
})
void nextTick(() => {
const formEl = document.querySelector('.app-forms-embedded form')
if (formEl) {
resizeObserver?.observe(formEl)
}
})
})

onUnmounted(() => {
unsubscribe('forms:last-updated:set', onSubmitMessageEvent)
resizeObserver?.disconnect()
})

return {
form,
isLoggedIn,
isEmbedded,
shareHash,
}
},
})
</script>
12 changes: 7 additions & 5 deletions src/components/AddQuestionMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
import IconPlus from '@material-symbols/svg-400/outlined/add.svg?raw'
import IconChevronLeft from '@material-symbols/svg-400/outlined/chevron_left.svg?raw'
import { t } from '@nextcloud/l10n'
import { defineComponent, ref, toRef, watch } from 'vue'
import { defineComponent, ref, watch } from 'vue'
import NcActionButton from '@nextcloud/vue/components/NcActionButton'
import NcActions from '@nextcloud/vue/components/NcActions'
import NcActionSeparator from '@nextcloud/vue/components/NcActionSeparator'
Expand Down Expand Up @@ -101,11 +101,13 @@ export default defineComponent({
setup(props, { emit }) {
const activeQuestionType = ref<string | null>(null)
const openLocal = ref<boolean>(props.open)
const open = toRef(props, 'open')

watch(open, (value: boolean) => {
openLocal.value = value
})
watch(
() => props.open,
(value: boolean) => {
openLocal.value = value
},
)

watch(openLocal, (value: boolean) => {
emit('update:open', value)
Expand Down
Loading
Loading