Skip to content

Commit

Permalink
feat: Split reference and smart picker functions from components
Browse files Browse the repository at this point in the history
Signed-off-by: Julius Härtl <jus@bitgrid.net>
  • Loading branch information
juliushaertl committed Feb 6, 2024
1 parent 7b46f6d commit 2e5e06c
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</template>

<script>
import { renderCustomPickerElement, isCustomPickerElementRegistered, destroyCustomPickerElement } from './customPickerElements.js'
import { renderCustomPickerElement, isCustomPickerElementRegistered, destroyCustomPickerElement } from './../../../functions/reference/customPickerElements.js'
export default {
name: 'NcCustomPickerElement',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</template>

<script>
import { searchProvider } from './providerHelper.js'
import { searchProvider } from './../../../functions/reference/providerHelper.js'
import { isUrl } from './utils.js'
import NcEmptyContent from '../../NcEmptyContent/index.js'
import NcHighlight from '../../NcHighlight/index.js'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import NcCustomPickerElement from './NcCustomPickerElement.vue'
import NcProviderList from './NcProviderList.vue'
import NcRawLinkInput from './NcRawLinkInput.vue'
import NcSearch from './NcSearch.vue'
import { isCustomPickerElementRegistered } from './customPickerElements.js'
import { touchProvider } from './providerHelper.js'
import { isCustomPickerElementRegistered } from './../../../functions/reference/customPickerElements.js'
import { touchProvider } from './../../../functions/reference/providerHelper.js'
const MODES = {
providerList: 1,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

<script>
import NcReferencePicker from './NcReferencePicker.vue'
import { getCustomPickerElementSize, isCustomPickerElementRegistered } from './customPickerElements.js'
import { getCustomPickerElementSize, isCustomPickerElementRegistered } from './../../../functions/reference/customPickerElements.js'
import NcButton from '../../NcButton/index.js'
import NcModal from '../../NcModal/index.js'
import { t } from '../../../l10n.js'
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcRichText/NcReferenceWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
</template>
<script>
import { renderWidget, isWidgetRegistered, destroyWidget } from './widgets.js'
import { renderWidget, isWidgetRegistered, destroyWidget } from './../../functions/reference/widgets.js'
export default {
name: 'NcReferenceWidget',
Expand Down
8 changes: 4 additions & 4 deletions src/components/NcRichText/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@

import NcRichText from './NcRichText.vue'

import { registerWidget, renderWidget, isWidgetRegistered } from './widgets.js'
import { registerWidget, renderWidget, isWidgetRegistered } from './../../functions/reference/widgets.js'
import NcReferenceList from './NcReferenceList.vue'
import NcReferenceWidget from './NcReferenceWidget.vue'
import NcReferencePicker from './NcReferencePicker/NcReferencePicker.vue'
import NcReferencePickerModal from './NcReferencePicker/NcReferencePickerModal.vue'
import NcSearch from './NcReferencePicker/NcSearch.vue'
import { getLinkWithPicker } from './NcReferencePicker/referencePickerModal.js'
import { getLinkWithPicker } from './../../functions/reference/referencePickerModal.js'
import {
getProvider,
getProviders,
sortProviders,
searchProvider,
anyLinkProviderId,
} from './NcReferencePicker/providerHelper.js'
} from '../../functions/reference/providerHelper.js'
import {
registerCustomPickerElement,
renderCustomPickerElement,
isCustomPickerElementRegistered,
NcCustomPickerRenderResult,
} from './NcReferencePicker/customPickerElements.js'
} from '../../functions/reference/customPickerElements.js'

export default NcRichText

Expand Down
1 change: 1 addition & 0 deletions src/functions/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './a11y/index.ts'
export * from './emoji/index.ts'
export * from './reference/index.js'
export { default as usernameToColor } from './usernameToColor/index.js'
32 changes: 32 additions & 0 deletions src/functions/reference/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { registerWidget, renderWidget, isWidgetRegistered } from './widgets.js'
import { getLinkWithPicker } from './referencePickerModal.js'
import {
getProvider,
getProviders,
sortProviders,
searchProvider,
anyLinkProviderId,
} from './providerHelper.js'
import {
registerCustomPickerElement,
renderCustomPickerElement,
isCustomPickerElementRegistered,
NcCustomPickerRenderResult,
} from './customPickerElements.js'

export {
registerWidget,
renderWidget,
isWidgetRegistered,

NcCustomPickerRenderResult,
registerCustomPickerElement,
renderCustomPickerElement,
isCustomPickerElementRegistered,
getLinkWithPicker,
anyLinkProviderId,
getProvider,
getProviders,
sortProviders,
searchProvider,
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { isCustomPickerElementRegistered } from './customPickerElements.js'

import { t } from '../../../l10n.js'
import { t } from '../../l10n.js'

import axios from '@nextcloud/axios'
import { loadState } from '@nextcloud/initial-state'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NcReferencePickerModal from './NcReferencePickerModal.vue'
import NcReferencePickerModal from './../../components/NcRichText/NcReferencePicker/NcReferencePickerModal.vue'
import { getProvider } from './providerHelper.js'

import Vue from 'vue'
Expand Down
File renamed without changes.
14 changes: 14 additions & 0 deletions src/functions/registerReference/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export {
registerWidget,
renderWidget,
destroyWidget,
isWidgetRegistered,
} from './../reference/widgets.js'
export {
NcCustomPickerRenderResult,
registerCustomPickerElement,
renderCustomPickerElement,
destroyCustomPickerElement,
isCustomPickerElementRegistered,
getCustomPickerElementSize,
} from './../reference/customPickerElements.js'

0 comments on commit 2e5e06c

Please sign in to comment.