diff options
| author | Aubrey-Li <63608597+Aubrey-Li@users.noreply.github.com> | 2021-07-24 14:02:03 -0700 |
|---|---|---|
| committer | Aubrey-Li <63608597+Aubrey-Li@users.noreply.github.com> | 2021-07-24 14:02:03 -0700 |
| commit | 2e87ebdef8061ca181864037f1378c46846243f1 (patch) | |
| tree | 98b3c3997cc8e2764d8d9ed2cd87c0f109fbd210 /src/client/views | |
| parent | cd047f0606b9b885b5a5980aba8f018d9f949282 (diff) | |
| parent | a062989fc54a302bca9004b1166ee5dbacade6a2 (diff) | |
Merge branch 'trails-aubrey' of https://github.com/brown-dash/Dash-Web into trails-aubrey
Diffstat (limited to 'src/client/views')
| -rw-r--r-- | src/client/views/ContextMenu.tsx | 2 | ||||
| -rw-r--r-- | src/client/views/nodes/MapBox/MapBox.tsx | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/client/views/ContextMenu.tsx b/src/client/views/ContextMenu.tsx index d96de72e3..c4fabbf99 100644 --- a/src/client/views/ContextMenu.tsx +++ b/src/client/views/ContextMenu.tsx @@ -218,7 +218,7 @@ export class ContextMenu extends React.Component { @computed get menuItems() { if (!this._searchString) { - return this._items.map(item => <ContextMenuItem {...item} noexpand={this.itemsNeedSearch ? true : (item as any).noexpand} key={item.description} closeMenu={this.closeMenu} />); + return this._items.map((item, ind) => <ContextMenuItem {...item} noexpand={this.itemsNeedSearch ? true : (item as any).noexpand} key={ind + item.description} closeMenu={this.closeMenu} />); } return this.filteredViews; } diff --git a/src/client/views/nodes/MapBox/MapBox.tsx b/src/client/views/nodes/MapBox/MapBox.tsx index aa220c4da..cc7bf6d84 100644 --- a/src/client/views/nodes/MapBox/MapBox.tsx +++ b/src/client/views/nodes/MapBox/MapBox.tsx @@ -287,15 +287,15 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps const { Document, fieldKey, isContentActive: active } = this.props; return <div className="MapBox"> - - <div className={"MapBox-contents"} + HELLO WORLD! + {/*<div className={"MapBox-contents"} style={{ pointerEvents: active() ? undefined : "none", overflow: 'hidden' }} onWheel={e => e.stopPropagation()} onPointerDown={e => (e.button === 0 && !e.ctrlKey) && e.stopPropagation()} > - {/* <LoadScript - googleMapsApiKey={process.env.GOOGLE_MAPS!} - libraries={['places', 'drawing']} - > */} + // {/* <LoadScript + // googleMapsApiKey={process.env.GOOGLE_MAPS!} + // libraries={['places', 'drawing']} + // > <div className="map-wrapper"> <GoogleMap mapContainerStyle={mapContainerStyle} @@ -355,7 +355,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps )} </GoogleMap> </div> - {/* </LoadScript > */} + {/* </LoadScript > <SidebarAnnos ref={this._sidebarRef} {...this.props} fieldKey={this.annotationKey} @@ -367,7 +367,7 @@ export class MapBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatableProps removeDocument={this.removeDocument} isContentActive={this.isContentActive} /> - </div > + </div >*/} </div >; } |