Skip to content

Commit

Permalink
Merge pull request #262 from gisce/hotfix/bug_webclient#401
Browse files Browse the repository at this point in the history
Fix bad conflict resolution
  • Loading branch information
mguellsegarra authored Dec 2, 2022
2 parents d14e5b6 + 402096c commit 00e49e6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions npm-shrinkwrap.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gisce/react-ooui",
"version": "1.1.17",
"version": "1.1.18",
"files": [
"dist",
"src",
Expand Down
3 changes: 2 additions & 1 deletion src/widgets/views/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ function Form(props: FormProps, ref: any) {
const responsiveBehaviour = containerWidth < WIDTH_BREAKPOINT;

const formContext = useContext(FormContext) as FormContextType;
const { activeId: parentId } = formContext || {};
const { activeId: parentId, getPlainValues: getParentPlainValues } =
formContext || {};

const actionViewContext = useContext(
ActionViewContext
Expand Down

0 comments on commit 00e49e6

Please sign in to comment.