Skip to content

Commit

Permalink
fix: move draw-styles to the constants
Browse files Browse the repository at this point in the history
  • Loading branch information
dqunbp committed Sep 17, 2020
1 parent 9116386 commit 1205b73
Show file tree
Hide file tree
Showing 4 changed files with 258 additions and 10 deletions.
31 changes: 23 additions & 8 deletions example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/draw-rectangle-styles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import defaultDrawThemes from "@mapbox/mapbox-gl-draw/src/lib/theme";
import { drawThemes } from "./lib";

const ActivePolygonStyles = [
{
Expand Down Expand Up @@ -37,7 +37,7 @@ const ActivePolygonStyles = [
];

function overrideDefaultStyles(themes) {
return defaultDrawThemes
return drawThemes
.filter((theme) => !themes.map(({ id }) => id).includes(theme.id))
.concat(themes);
}
Expand Down
232 changes: 232 additions & 0 deletions src/lib/draw-themes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
export const drawThemes = [
{
id: "gl-draw-polygon-fill-inactive",
type: "fill",
filter: [
"all",
["==", "active", "false"],
["==", "$type", "Polygon"],
["!=", "mode", "static"],
],
paint: {
"fill-color": "#3bb2d0",
"fill-outline-color": "#3bb2d0",
"fill-opacity": 0.1,
},
},
{
id: "gl-draw-polygon-fill-active",
type: "fill",
filter: ["all", ["==", "active", "true"], ["==", "$type", "Polygon"]],
paint: {
"fill-color": "#fbb03b",
"fill-outline-color": "#fbb03b",
"fill-opacity": 0.1,
},
},
{
id: "gl-draw-polygon-midpoint",
type: "circle",
filter: ["all", ["==", "$type", "Point"], ["==", "meta", "midpoint"]],
paint: {
"circle-radius": 3,
"circle-color": "#fbb03b",
},
},
{
id: "gl-draw-polygon-stroke-inactive",
type: "line",
filter: [
"all",
["==", "active", "false"],
["==", "$type", "Polygon"],
["!=", "mode", "static"],
],
layout: {
"line-cap": "round",
"line-join": "round",
},
paint: {
"line-color": "#3bb2d0",
"line-width": 2,
},
},
{
id: "gl-draw-polygon-stroke-active",
type: "line",
filter: ["all", ["==", "active", "true"], ["==", "$type", "Polygon"]],
layout: {
"line-cap": "round",
"line-join": "round",
},
paint: {
"line-color": "#fbb03b",
"line-dasharray": [0.2, 2],
"line-width": 2,
},
},
{
id: "gl-draw-line-inactive",
type: "line",
filter: [
"all",
["==", "active", "false"],
["==", "$type", "LineString"],
["!=", "mode", "static"],
],
layout: {
"line-cap": "round",
"line-join": "round",
},
paint: {
"line-color": "#3bb2d0",
"line-width": 2,
},
},
{
id: "gl-draw-line-active",
type: "line",
filter: ["all", ["==", "$type", "LineString"], ["==", "active", "true"]],
layout: {
"line-cap": "round",
"line-join": "round",
},
paint: {
"line-color": "#fbb03b",
"line-dasharray": [0.2, 2],
"line-width": 2,
},
},
{
id: "gl-draw-polygon-and-line-vertex-stroke-inactive",
type: "circle",
filter: [
"all",
["==", "meta", "vertex"],
["==", "$type", "Point"],
["!=", "mode", "static"],
],
paint: {
"circle-radius": 5,
"circle-color": "#fff",
},
},
{
id: "gl-draw-polygon-and-line-vertex-inactive",
type: "circle",
filter: [
"all",
["==", "meta", "vertex"],
["==", "$type", "Point"],
["!=", "mode", "static"],
],
paint: {
"circle-radius": 3,
"circle-color": "#fbb03b",
},
},
{
id: "gl-draw-point-point-stroke-inactive",
type: "circle",
filter: [
"all",
["==", "active", "false"],
["==", "$type", "Point"],
["==", "meta", "feature"],
["!=", "mode", "static"],
],
paint: {
"circle-radius": 5,
"circle-opacity": 1,
"circle-color": "#fff",
},
},
{
id: "gl-draw-point-inactive",
type: "circle",
filter: [
"all",
["==", "active", "false"],
["==", "$type", "Point"],
["==", "meta", "feature"],
["!=", "mode", "static"],
],
paint: {
"circle-radius": 3,
"circle-color": "#3bb2d0",
},
},
{
id: "gl-draw-point-stroke-active",
type: "circle",
filter: [
"all",
["==", "$type", "Point"],
["==", "active", "true"],
["!=", "meta", "midpoint"],
],
paint: {
"circle-radius": 7,
"circle-color": "#fff",
},
},
{
id: "gl-draw-point-active",
type: "circle",
filter: [
"all",
["==", "$type", "Point"],
["!=", "meta", "midpoint"],
["==", "active", "true"],
],
paint: {
"circle-radius": 5,
"circle-color": "#fbb03b",
},
},
{
id: "gl-draw-polygon-fill-static",
type: "fill",
filter: ["all", ["==", "mode", "static"], ["==", "$type", "Polygon"]],
paint: {
"fill-color": "#404040",
"fill-outline-color": "#404040",
"fill-opacity": 0.1,
},
},
{
id: "gl-draw-polygon-stroke-static",
type: "line",
filter: ["all", ["==", "mode", "static"], ["==", "$type", "Polygon"]],
layout: {
"line-cap": "round",
"line-join": "round",
},
paint: {
"line-color": "#404040",
"line-width": 2,
},
},
{
id: "gl-draw-line-static",
type: "line",
filter: ["all", ["==", "mode", "static"], ["==", "$type", "LineString"]],
layout: {
"line-cap": "round",
"line-join": "round",
},
paint: {
"line-color": "#404040",
"line-width": 2,
},
},
{
id: "gl-draw-point-static",
type: "circle",
filter: ["all", ["==", "mode", "static"], ["==", "$type", "Point"]],
paint: {
"circle-radius": 5,
"circle-color": "#404040",
},
},
];
1 change: 1 addition & 0 deletions src/lib/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from "./constants";
export * from "./common-selectors";
export * from "./create-vertex";
export * from "./draw-themes";

0 comments on commit 1205b73

Please sign in to comment.