Merge branch 'main' into update/polar-core-documentation_plugin.fields

Dataport · Aug 1, 2024 · 272c336 · 272c336
2 parents c59f501 + 4a5733f
commit 272c336
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/packages/plugins/Attributions/CHANGELOG.md b/packages/plugins/Attributions/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## unpublished
 
+- Feature: Add new option `'footer'` to configuration parameter `renderType` that changes the attributions to be displayed as a small version of the information box that is always visible.
 - Refactor: Replace redundant props with computed properties.
 
 ## 1.2.1

diff --git a/packages/plugins/Attributions/src/components/AttributionContent.vue b/packages/plugins/Attributions/src/components/AttributionContent.vue
@@ -1,7 +1,14 @@
 <template>
   <v-scroll-x-reverse-transition>
-    <v-card dense filled :width="width" :color="color" :max-width="maxWidth">
-      <v-card-title>
+    <v-card
+      :class="renderType === 'footer' ? 'polar-plugin-attributions-footer' : ''"
+      dense
+      filled
+      :width="width"
+      :color="color"
+      :max-width="maxWidth"
+    >
+      <v-card-title v-if="renderType !== 'footer'">
         {{ $t('common:plugins.attributions.title') }}
       </v-card-title>
       <!-- NOTE: The usage of v-html is considered unsafe as it
@@ -48,7 +55,9 @@ export default Vue.extend({
       return this.renderType === 'independent'
     },
     color() {
-      return this.renderIndependently ? '#ffffffdd' : ''
+      return this.renderType === 'independent' || this.renderType === 'footer'
+        ? '#ffffffdd'
+        : ''
     },
     maxWidth() {
       return this.renderIndependently
@@ -76,4 +85,13 @@ export default Vue.extend({
 })
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.polar-plugin-attributions-footer {
+  margin: 4px;
+}
+.polar-plugin-attributions-footer .v-card__text {
+  font-size: 0.8rem;
+  padding: 2px;
+  line-height: 1.1;
+}
+</style>
diff --git a/packages/plugins/Attributions/src/types.ts b/packages/plugins/Attributions/src/types.ts
@@ -18,7 +18,7 @@ export interface AttributionsGetters extends AttributionsState {
   listenToChanges: string[]
   mapInfo: string[]
   initiallyOpen: boolean
-  renderType: 'independent' | 'iconMenu'
+  renderType: 'independent' | 'iconMenu' | 'footer'
   staticAttributions: string[]
   windowWidth: number
 }
diff --git a/packages/types/custom/CHANGELOG.md b/packages/types/custom/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Feature: Add `afterResultComponent` to `AddressSearchConfiguration` for custom search result suffixes.
 - Feature: Add `mapHasDimensions` to `CoreState` and `CoreGetters`.
 - Feature: Add new getter `deviceIsHorizontal` to `CoreGetters`.
+- Feature: Add `footer` to `RenderType` as an option to display attributions in a footer.
 - Fix: Add `string` as option for `SearchType` since arbitrary strings can be registered.
 - Fix: Remove unused parameters `proxyUrl` and `loadingStrategy` from `LayerConfigurationOptions`.
 - Fix: Properly document optional parameters of interfaces `AddressSearchConfiguration`, `FeatureList`, `FilterConfigurationTime`, `FilterConfigurationTimeOption`, `GeoLocationConfiguration`, `LayerConfigurationOptionLayers` and `PinsConfiguration`

diff --git a/packages/types/custom/core.ts b/packages/types/custom/core.ts
@@ -32,7 +32,7 @@ export interface PluginOptions {
   layoutTag?: string // TODO: Might it be useful to move declaration of NineLayoutTag here?
 }
 
-export type RenderType = 'iconMenu' | 'independent'
+export type RenderType = 'iconMenu' | 'independent' | 'footer'
 
 /** Possible search methods by type */
 export type SearchType = 'bkg' | 'gazetteer' | 'wfs' | 'mpapi' | string