Skip to content

Commit efea59d

Browse files
committed
Remove anywidget experimental
1 parent e04727b commit efea59d

File tree

2 files changed

+6
-33
lines changed

2 files changed

+6
-33
lines changed

src/index.tsx

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
import * as React from "react";
22
import { useEffect, useCallback, useState } from "react";
3-
import {
4-
createRender,
5-
useModelState,
6-
useModel,
7-
useExperimental,
8-
} from "@anywidget/react";
9-
import type { Experimental, Initialize, Render } from "@anywidget/types";
3+
import { createRender, useModelState, useModel } from "@anywidget/react";
4+
import type { Initialize, Render } from "@anywidget/types";
105
import Map from "react-map-gl/maplibre";
116
import DeckGL from "@deck.gl/react";
127
import { MapViewState, PickingInfo, type Layer } from "@deck.gl/core";
@@ -47,7 +42,6 @@ async function getChildModelState(
4742
childLayerIds: string[],
4843
previousSubModelState: Record<string, BaseLayerModel>,
4944
setStateCounter: React.Dispatch<React.SetStateAction<Date>>,
50-
anywidgetExperimental: Experimental,
5145
): Promise<Record<string, BaseLayerModel>> {
5246
const newSubModelState: Record<string, BaseLayerModel> = {};
5347
const updateStateCallback = () => setStateCounter(new Date());
@@ -65,10 +59,7 @@ async function getChildModelState(
6559
continue;
6660
}
6761

68-
const childLayer = await initializeLayer(childModel, {
69-
updateStateCallback,
70-
anywidgetExperimental,
71-
});
62+
const childLayer = await initializeLayer(childModel, updateStateCallback);
7263
newSubModelState[childLayerId] = childLayer;
7364
}
7465

@@ -112,7 +103,6 @@ function App() {
112103
);
113104
const [parameters] = useModelState<object>("parameters");
114105
const [customAttribution] = useModelState<string>("custom_attribution");
115-
const anywidgetExperimental = useExperimental();
116106

117107
// initialViewState is the value of view_state on the Python side. This is
118108
// called `initial` here because it gets passed in to deck's
@@ -162,7 +152,6 @@ function App() {
162152
childLayerIds,
163153
subModelState,
164154
setStateCounter,
165-
anywidgetExperimental,
166155
);
167156
setSubModelState(newSubModelState);
168157

src/model/layer.ts

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import { BaseLayerModel } from "./base-layer.js";
2727
import { BitmapLayer, BitmapLayerProps } from "@deck.gl/layers";
2828
import { TileLayer, TileLayerProps } from "@deck.gl/geo-layers";
2929
import { isDefined } from "../util.js";
30-
import { Experimental } from "@anywidget/types";
3130
import { invoke } from "./invoke.js";
3231

3332
/**
@@ -227,13 +226,7 @@ export class BitmapTileModel extends BaseLayerModel {
227226
protected transparentColor: BitmapLayerProps["transparentColor"];
228227
protected tintColor: BitmapLayerProps["tintColor"];
229228

230-
protected anywidgetExperimental: Experimental;
231-
232-
constructor(
233-
model: WidgetModel,
234-
updateStateCallback: () => void,
235-
anywidgetExperimental: Experimental,
236-
) {
229+
constructor(model: WidgetModel, updateStateCallback: () => void) {
237230
super(model, updateStateCallback);
238231

239232
this.initRegularAttribute("data", "data");
@@ -250,8 +243,6 @@ export class BitmapTileModel extends BaseLayerModel {
250243
this.initRegularAttribute("desaturate", "desaturate");
251244
this.initRegularAttribute("transparent_color", "transparentColor");
252245
this.initRegularAttribute("tint_color", "tintColor");
253-
254-
this.anywidgetExperimental = anywidgetExperimental;
255246
}
256247

257248
bitmapLayerProps(): Omit<BitmapLayerProps, "id" | "data"> {
@@ -973,10 +964,7 @@ export class TextModel extends BaseArrowLayerModel {
973964

974965
export async function initializeLayer(
975966
model: WidgetModel,
976-
{
977-
updateStateCallback,
978-
anywidgetExperimental,
979-
}: { updateStateCallback: () => void; anywidgetExperimental: Experimental },
967+
updateStateCallback: () => void,
980968
): Promise<BaseLayerModel> {
981969
const layerType = model.get("_layer_type");
982970
let layerModel: BaseLayerModel;
@@ -990,11 +978,7 @@ export async function initializeLayer(
990978
break;
991979

992980
case BitmapTileModel.layerType:
993-
layerModel = new BitmapTileModel(
994-
model,
995-
updateStateCallback,
996-
anywidgetExperimental,
997-
);
981+
layerModel = new BitmapTileModel(model, updateStateCallback);
998982
break;
999983

1000984
case ColumnModel.layerType:

0 commit comments

Comments
 (0)