Skip to content

Commit

Permalink
Merge pull request #1028 from Esri/start-r1
Browse files Browse the repository at this point in the history
deprecated updates
  • Loading branch information
jmhauck authored Nov 26, 2024
2 parents 117c93e + 35e44e6 commit 47f37df
Show file tree
Hide file tree
Showing 24 changed files with 198 additions and 374 deletions.
17 changes: 2 additions & 15 deletions src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ export { IReportingOptions as IReportingOptions1 } from "./components";
export { ILayerItemsHash } from "./components/layer-list/layer-list";
export { UserSession } from "@esri/solution-common";
export namespace Components {
interface ArcgisLogin {
}
interface BasemapGallery {
/**
* IBasemapConfig: List of any basemaps to filter out from the basemap widget
Expand Down Expand Up @@ -528,7 +526,7 @@ export namespace Components {
*/
"buttonType": ButtonType;
/**
* calcite-modal: Use this prop when using the button within a parent like a dropdown that would constrain the modal and that is not desired
* calcite-dialog: Use this prop when using the button within a parent like a dropdown that would constrain the dialog and that is not desired
*/
"deleteDialog": any;
/**
Expand Down Expand Up @@ -2046,12 +2044,6 @@ export interface StoreManagerCustomEvent<T> extends CustomEvent<T> {
target: HTMLStoreManagerElement;
}
declare global {
interface HTMLArcgisLoginElement extends Components.ArcgisLogin, HTMLStencilElement {
}
var HTMLArcgisLoginElement: {
prototype: HTMLArcgisLoginElement;
new (): HTMLArcgisLoginElement;
};
interface HTMLBasemapGalleryElement extends Components.BasemapGallery, HTMLStencilElement {
}
var HTMLBasemapGalleryElement: {
Expand Down Expand Up @@ -2713,7 +2705,6 @@ declare global {
new (): HTMLStoreManagerElement;
};
interface HTMLElementTagNameMap {
"arcgis-login": HTMLArcgisLoginElement;
"basemap-gallery": HTMLBasemapGalleryElement;
"buffer-tools": HTMLBufferToolsElement;
"card-manager": HTMLCardManagerElement;
Expand Down Expand Up @@ -2764,8 +2755,6 @@ declare global {
}
}
declare namespace LocalJSX {
interface ArcgisLogin {
}
interface BasemapGallery {
/**
* IBasemapConfig: List of any basemaps to filter out from the basemap widget
Expand Down Expand Up @@ -3335,7 +3324,7 @@ declare namespace LocalJSX {
*/
"buttonType"?: ButtonType;
/**
* calcite-modal: Use this prop when using the button within a parent like a dropdown that would constrain the modal and that is not desired
* calcite-dialog: Use this prop when using the button within a parent like a dropdown that would constrain the dialog and that is not desired
*/
"deleteDialog"?: any;
/**
Expand Down Expand Up @@ -4704,7 +4693,6 @@ declare namespace LocalJSX {
"value"?: string;
}
interface IntrinsicElements {
"arcgis-login": ArcgisLogin;
"basemap-gallery": BasemapGallery;
"buffer-tools": BufferTools;
"card-manager": CardManager;
Expand Down Expand Up @@ -4758,7 +4746,6 @@ export { LocalJSX as JSX };
declare module "@stencil/core" {
export namespace JSX {
interface IntrinsicElements {
"arcgis-login": LocalJSX.ArcgisLogin & JSXBase.HTMLAttributes<HTMLArcgisLoginElement>;
"basemap-gallery": LocalJSX.BasemapGallery & JSXBase.HTMLAttributes<HTMLBasemapGalleryElement>;
"buffer-tools": LocalJSX.BufferTools & JSXBase.HTMLAttributes<HTMLBufferToolsElement>;
"card-manager": LocalJSX.CardManager & JSXBase.HTMLAttributes<HTMLCardManagerElement>;
Expand Down
19 changes: 0 additions & 19 deletions src/components/arcgis-login/arcgis-login.css

This file was deleted.

89 changes: 0 additions & 89 deletions src/components/arcgis-login/arcgis-login.tsx

This file was deleted.

10 changes: 0 additions & 10 deletions src/components/arcgis-login/readme.md

This file was deleted.

27 changes: 0 additions & 27 deletions src/components/arcgis-login/test/arcgis-login.e2e.ts

This file was deleted.

34 changes: 0 additions & 34 deletions src/components/arcgis-login/test/arcgis-login.spec.tsx

This file was deleted.

18 changes: 9 additions & 9 deletions src/components/card-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,24 @@ graph TD;
delete-button --> delete-dialog
calcite-action --> calcite-loader
calcite-action --> calcite-icon
delete-dialog --> calcite-modal
delete-dialog --> calcite-dialog
delete-dialog --> calcite-button
calcite-modal --> calcite-scrim
calcite-modal --> calcite-icon
calcite-dialog --> calcite-scrim
calcite-dialog --> calcite-panel
calcite-scrim --> calcite-loader
edit-card --> calcite-notice
edit-card --> calcite-loader
calcite-notice --> calcite-icon
calcite-alert --> calcite-icon
calcite-alert --> calcite-chip
calcite-chip --> calcite-icon
calcite-panel --> calcite-action
calcite-panel --> calcite-action-menu
calcite-panel --> calcite-scrim
calcite-action-menu --> calcite-action
calcite-action-menu --> calcite-popover
calcite-popover --> calcite-action
calcite-popover --> calcite-icon
edit-card --> calcite-notice
edit-card --> calcite-loader
calcite-notice --> calcite-icon
calcite-alert --> calcite-icon
calcite-alert --> calcite-chip
calcite-chip --> calcite-icon
calcite-flow-item --> calcite-action
calcite-flow-item --> calcite-panel
create-feature --> calcite-notice
Expand Down
4 changes: 4 additions & 0 deletions src/components/crowdsource-manager/crowdsource-manager.css
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,8 @@

.z-index-1 {
z-index: 1 !important;
}

.filter-content-space {
--calcite-dialog-content-space: 0px;
}
59 changes: 26 additions & 33 deletions src/components/crowdsource-manager/crowdsource-manager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1175,43 +1175,36 @@ export class CrowdsourceManager {
*/
protected _filterModal(): VNode {
return (
<calcite-modal
aria-labelledby="modal-title"
class="modal"
<calcite-dialog
class="filter-content-space"
heading={this._translations?.filter?.replace("{{title}}", this._layer?.title)}
id="solutions-filter-dialog"
kind="brand"
onCalciteModalClose={() => void this._closeFilter()}
modal={true}
onCalciteDialogClose={() => void this._closeFilter()}
open={this._filterOpen}
widthScale="s"
>
<div
class="display-flex align-center"
id="modal-title"
slot="header"
>
{this._translations?.filter?.replace("{{title}}", this._layer?.title)}
</div>
<div slot="content">
<instant-apps-filter-list
autoUpdateUrl={false}
closeBtn={true}
closeBtnOnClick={async () => this._closeFilter()}
comboboxOverlayPositioning="fixed"
layerExpressions={this._layerExpressions}
onFilterListReset={() => {
this._handleFilterListReset();
void this._mapCard.resetFilter();
}}
onFilterUpdate={async () => {
const active = this._filterList.filterCount > 0;
await this._layerTable?.filterUpdate(active);
await this._mapCard.updateFilterState(active);
}}
ref={(el) => this._filterList = el}
view={this._mapView}
zoomBtn={false}
/>
</div>
</calcite-modal>
<instant-apps-filter-list
autoUpdateUrl={false}
closeBtn={true}
closeBtnOnClick={async () => this._closeFilter()}
comboboxOverlayPositioning="fixed"
layerExpressions={this._layerExpressions}
onFilterListReset={() => {
this._handleFilterListReset();
void this._mapCard.resetFilter();
}}
onFilterUpdate={async () => {
const active = this._filterList.filterCount > 0;
await this._layerTable?.filterUpdate(active);
await this._mapCard.updateFilterState(active);
}}
ref={(el) => this._filterList = el}
view={this._mapView}
zoomBtn={false}
/>
</calcite-dialog>
);
}

Expand Down
Loading

0 comments on commit 47f37df

Please sign in to comment.