Skip to content

Commit

Permalink
move boostrap to bootstrap package
Browse files Browse the repository at this point in the history
  • Loading branch information
eric-burel committed May 10, 2022
1 parent 116a180 commit 9aa6613
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import { Button } from "../core/Button";
import { TooltipTrigger } from "../core/TooltipTrigger";
import { PossibleCoreComponents } from "@vulcanjs/react-ui";

// Specific to boostrap, not coded yet in "lite" version
import Dropdown from "../bootstrap/Dropdown";
import { BootstrapModal } from "../bootstrap/Modal";
import { ModalTrigger } from "../bootstrap/ModalTrigger";

export const bootstrapCoreComponents: Partial<PossibleCoreComponents> = {
Button,
TooltipTrigger,
Dropdown,
ModalTrigger,
Modal: BootstrapModal,
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import type { PossibleFormComponents } from "@vulcanjs/react-ui";
import {
FormComponentCheckboxGroup,
FormComponentRadioGroup,
AutocompleteMultiple,
FormComponentAutocomplete,
} from "../form/inputs";
/*
import {
Expand Down Expand Up @@ -135,6 +137,8 @@ export const bootstrapFormComponents: Partial<PossibleFormComponents> = {
//
FormItem,
FormComponentAutocomplete,
FormComponentMultiAutocomplete: AutocompleteMultiple,
*/

FormComponentAutocomplete,
FormComponentMultiAutocomplete: AutocompleteMultiple,
};
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import React, { useState } from "react";
import { useLazyQuery } from "@apollo/client";
import gql from "graphql-tag";
import { useVulcanComponents } from "@vulcanjs/react-ui";
import { useFormContext } from "../core/FormContext";
import { useFormContext } from "@vulcanjs/react-ui";

export const Autocomplete = (props) => {
const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import React, { useState } from "react";
import { useLazyQuery } from "@apollo/client";
import gql from "graphql-tag";
import { useVulcanComponents } from "@vulcanjs/react-ui";
import type { FormInputProps } from "../typings";
import { useFormContext } from "../core/FormContext";
import type { FormInputProps } from "@vulcanjs/react-ui";
import { useFormContext } from "@vulcanjs/react-ui";

export interface AutocompleteMultipleProps extends FormInputProps { }
export const AutocompleteMultiple = (props: AutocompleteMultipleProps) => {
Expand Down
3 changes: 3 additions & 0 deletions packages/react-ui-bootstrap/components/form/inputs/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
export { FormComponentCheckboxGroup } from "./Checkboxgroup";
export { FormComponentRadioGroup } from "./Radiogroup";
export { AutocompleteMultiple } from "./AutocompleteMultiple";

export { Autocomplete as FormComponentAutocomplete } from "./Autocomplete";
2 changes: 2 additions & 0 deletions packages/react-ui-bootstrap/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
//export * from "./components/form";
export * from "./components/VulcanComponents";

export * from "./components/form/inputs/AutocompleteMultiple";
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,10 @@ import { Loading } from "../../core/Loading";

import { HeadTags } from "../../core/HeadTags";

// TODO: rewrite to remove dep to react-bootstrap
import { TooltipTrigger } from "../../bootstrap/TooltipTrigger";
import Dropdown from "../../bootstrap/Dropdown";

import {
defaultCoreComponents,
PossibleCoreComponents,
} from "@vulcanjs/react-ui";
import { BootstrapModal } from "../../bootstrap/Modal";
import { ModalTrigger } from "../../bootstrap/ModalTrigger";

/**
* Minimal set of components, mandatory to operate Vulcan React UI
Expand All @@ -29,9 +23,4 @@ export const liteCoreComponents: Partial<PossibleCoreComponents> = {
FormattedMessage,
// core
HeadTags,
//
TooltipTrigger,
Dropdown,
Modal: BootstrapModal,
ModalTrigger,
};
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ import {
FormItem,
FormOptionLabel,
//
AutocompleteMultiple,
} from "../../form/inputs";

export const liteFormComponents: Partial<PossibleFormComponents> = {
Expand Down Expand Up @@ -126,6 +125,4 @@ export const liteFormComponents: Partial<PossibleFormComponents> = {
FormOptionLabel,
//
FormItem,
FormComponentAutocomplete,
FormComponentMultiAutocomplete: AutocompleteMultiple,
};
2 changes: 0 additions & 2 deletions packages/react-ui-lite/components/form/inputs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ export * from "./SelectInputs";

export * from "./FormItem";
export * from "./FormOptionLabel";

export * from "./AutocompleteMultiple";
4 changes: 1 addition & 3 deletions packages/react-ui-lite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
"dependencies": {
"classnames": "^2.3.1",
"debug": "^4.3.1",
"lodash": "^4.17.21",
"react-bootstrap": "^2.0.3",
"react-bootstrap-typeahead": "^6.0.0-alpha.4"
"lodash": "^4.17.21"
},
"peerDependencies": {
"@vulcanjs/react-ui": "*",
Expand Down

0 comments on commit 9aa6613

Please sign in to comment.