Map - add Azure provider in declarations (#28126)

DevExpress · Oct 10, 2024 · 19dbffb · 19dbffb
1 parent 4669954
commit 19dbffb
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 6 deletions.
diff --git a/packages/devextreme-angular/src/ui/map/index.ts b/packages/devextreme-angular/src/ui/map/index.ts
@@ -110,10 +110,10 @@ export class DxMapComponent extends DxComponent implements OnDestroy, OnChanges,
     
      */
     @Input()
-    get apiKey(): string | { bing?: string, google?: string, googleStatic?: string } {
+    get apiKey(): string | { azure?: string, bing?: string, google?: string, googleStatic?: string } {
         return this._getOption('apiKey');
     }
-    set apiKey(value: string | { bing?: string, google?: string, googleStatic?: string }) {
+    set apiKey(value: string | { azure?: string, bing?: string, google?: string, googleStatic?: string }) {
         this._setOption('apiKey', value);
     }
 
@@ -468,7 +468,7 @@ export class DxMapComponent extends DxComponent implements OnDestroy, OnChanges,
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() apiKeyChange: EventEmitter<string | { bing?: string, google?: string, googleStatic?: string }>;
+    @Output() apiKeyChange: EventEmitter<string | { azure?: string, bing?: string, google?: string, googleStatic?: string }>;
 
     /**
     

diff --git a/packages/devextreme-angular/src/ui/map/nested/api-key.ts b/packages/devextreme-angular/src/ui/map/nested/api-key.ts
@@ -28,6 +28,14 @@ import { NestedOption } from 'devextreme-angular/core';
     providers: [NestedOptionHost]
 })
 export class DxoMapApiKeyComponent extends NestedOption implements OnDestroy, OnInit  {
+    @Input()
+    get azure(): string {
+        return this._getOption('azure');
+    }
+    set azure(value: string) {
+        this._setOption('azure', value);
+    }
+
     @Input()
     get bing(): string {
         return this._getOption('bing');

diff --git a/packages/devextreme-angular/src/ui/nested/api-key.ts b/packages/devextreme-angular/src/ui/nested/api-key.ts
@@ -28,6 +28,14 @@ import { NestedOption } from 'devextreme-angular/core';
     providers: [NestedOptionHost]
 })
 export class DxoApiKeyComponent extends NestedOption implements OnDestroy, OnInit  {
+    @Input()
+    get azure(): string {
+        return this._getOption('azure');
+    }
+    set azure(value: string) {
+        this._setOption('azure', value);
+    }
+
     @Input()
     get bing(): string {
         return this._getOption('bing');

diff --git a/packages/devextreme-react/src/map.ts b/packages/devextreme-react/src/map.ts
@@ -90,6 +90,7 @@ const Map = memo(
 // owners:
 // Map
 type IApiKeyProps = React.PropsWithChildren<{
+  azure?: string;
   bing?: string;
   google?: string;
   googleStatic?: string;

diff --git a/packages/devextreme-vue/src/map.ts b/packages/devextreme-vue/src/map.ts
@@ -140,11 +140,13 @@ const DxApiKeyConfig = {
   emits: {
     "update:isActive": null,
     "update:hoveredElement": null,
+    "update:azure": null,
     "update:bing": null,
     "update:google": null,
     "update:googleStatic": null,
   },
   props: {
+    azure: String,
     bing: String,
     google: String,
     googleStatic: String

diff --git a/packages/devextreme/js/ui/map.d.ts b/packages/devextreme/js/ui/map.d.ts
@@ -14,7 +14,7 @@ import Widget, {
 } from './widget/ui.widget';
 
 /** @public */
-export type MapProvider = 'bing' | 'google' | 'googleStatic';
+export type MapProvider = 'azure' | 'bing' | 'google' | 'googleStatic';
 /** @public */
 export type RouteMode = 'driving' | 'walking';
 /** @public */
@@ -159,14 +159,20 @@ export interface MapLocation {
 export interface dxMapOptions extends WidgetOptions<dxMap> {
     /**
      * @docid
-     * @default { bing: '', google: '', googleStatic: '' }
+     * @default { azure: '', bing: '', google: '', googleStatic: '' }
      * @public
      */
     apiKey?: string | {
       /**
        * @docid
        * @default ""
        */
+      azure?: string;
+      /**
+       * @docid
+       * @deprecated
+       * @default ""
+       */
       bing?: string;
       /**
        * @docid

diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts
@@ -20662,7 +20662,7 @@ declare module DevExpress.ui {
      */
     export type InitializedEvent =
       DevExpress.events.InitializedEventInfo<dxMap>;
-    export type MapProvider = 'bing' | 'google' | 'googleStatic';
+    export type MapProvider = 'azure' | 'bing' | 'google' | 'googleStatic';
     export type MapType = 'hybrid' | 'roadmap' | 'satellite';
     /**
      * [descr:_ui_map_MarkerAddedEvent]
@@ -20737,8 +20737,13 @@ declare module DevExpress.ui {
     apiKey?:
       | string
       | {
+          /**
+           * [descr:dxMapOptions.apiKey.azure]
+           */
+          azure?: string;
           /**
            * [descr:dxMapOptions.apiKey.bing]
+           * @deprecated [depNote:dxMapOptions.apiKey.bing]
            */
           bing?: string;
           /**