Skip to content

Commit 2991045

Browse files
tomzemptomzemp
committed
fix: working autorsize width
1 parent dbb6e26 commit 2991045

3 files changed

Lines changed: 47 additions & 36 deletions

File tree

‎examples/cra/yarn.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,32 +1054,32 @@
10541054
integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg==
10551055

10561056
"@dhis2/app-runtime@file:../../runtime":
1057-
version "3.10.0-alpha.1"
1057+
version "3.10.0-alpha.2"
10581058
dependencies:
1059-
"@dhis2/app-service-alerts" "3.10.0-alpha.1"
1060-
"@dhis2/app-service-config" "3.10.0-alpha.1"
1061-
"@dhis2/app-service-data" "3.10.0-alpha.1"
1062-
"@dhis2/app-service-offline" "3.10.0-alpha.1"
1063-
"@dhis2/app-service-plugin" "3.10.0-alpha.1"
1059+
"@dhis2/app-service-alerts" "3.10.0-alpha.2"
1060+
"@dhis2/app-service-config" "3.10.0-alpha.2"
1061+
"@dhis2/app-service-data" "3.10.0-alpha.2"
1062+
"@dhis2/app-service-offline" "3.10.0-alpha.2"
1063+
"@dhis2/app-service-plugin" "3.10.0-alpha.2"
10641064

1065-
"@dhis2/app-service-alerts@3.10.0-alpha.1", "@dhis2/app-service-alerts@file:../../services/alerts":
1066-
version "3.10.0-alpha.1"
1065+
"@dhis2/app-service-alerts@3.10.0-alpha.2", "@dhis2/app-service-alerts@file:../../services/alerts":
1066+
version "3.10.0-alpha.2"
10671067

1068-
"@dhis2/app-service-config@3.10.0-alpha.1", "@dhis2/app-service-config@file:../../services/config":
1069-
version "3.10.0-alpha.1"
1068+
"@dhis2/app-service-config@3.10.0-alpha.2", "@dhis2/app-service-config@file:../../services/config":
1069+
version "3.10.0-alpha.2"
10701070

1071-
"@dhis2/app-service-data@3.10.0-alpha.1", "@dhis2/app-service-data@file:../../services/data":
1072-
version "3.10.0-alpha.1"
1071+
"@dhis2/app-service-data@3.10.0-alpha.2", "@dhis2/app-service-data@file:../../services/data":
1072+
version "3.10.0-alpha.2"
10731073
dependencies:
10741074
react-query "^3.13.11"
10751075

1076-
"@dhis2/app-service-offline@3.10.0-alpha.1", "@dhis2/app-service-offline@file:../../services/offline":
1077-
version "3.10.0-alpha.1"
1076+
"@dhis2/app-service-offline@3.10.0-alpha.2", "@dhis2/app-service-offline@file:../../services/offline":
1077+
version "3.10.0-alpha.2"
10781078
dependencies:
10791079
lodash "^4.17.21"
10801080

1081-
"@dhis2/app-service-plugin@3.10.0-alpha.1", "@dhis2/app-service-plugin@file:../../services/plugin":
1082-
version "3.10.0-alpha.1"
1081+
"@dhis2/app-service-plugin@3.10.0-alpha.2", "@dhis2/app-service-plugin@file:../../services/plugin":
1082+
version "3.10.0-alpha.2"
10831083
dependencies:
10841084
post-robot "^10.0.46"
10851085

‎examples/query-playground/yarn.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,32 +1800,32 @@
18001800
"@dhis2/app-service-offline" "3.8.0"
18011801

18021802
"@dhis2/app-runtime@^2.2.2", "@dhis2/app-runtime@file:../../runtime":
1803-
version "3.10.0-alpha.1"
1803+
version "3.10.0-alpha.2"
18041804
dependencies:
1805-
"@dhis2/app-service-alerts" "3.10.0-alpha.1"
1806-
"@dhis2/app-service-config" "3.10.0-alpha.1"
1807-
"@dhis2/app-service-data" "3.10.0-alpha.1"
1808-
"@dhis2/app-service-offline" "3.10.0-alpha.1"
1809-
"@dhis2/app-service-plugin" "3.10.0-alpha.1"
1805+
"@dhis2/app-service-alerts" "3.10.0-alpha.2"
1806+
"@dhis2/app-service-config" "3.10.0-alpha.2"
1807+
"@dhis2/app-service-data" "3.10.0-alpha.2"
1808+
"@dhis2/app-service-offline" "3.10.0-alpha.2"
1809+
"@dhis2/app-service-plugin" "3.10.0-alpha.2"
18101810

1811-
"@dhis2/app-service-alerts@3.10.0-alpha.1", "@dhis2/app-service-alerts@3.8.0", "@dhis2/app-service-alerts@file:../../services/alerts":
1812-
version "3.10.0-alpha.1"
1811+
"@dhis2/app-service-alerts@3.10.0-alpha.2", "@dhis2/app-service-alerts@3.8.0", "@dhis2/app-service-alerts@file:../../services/alerts":
1812+
version "3.10.0-alpha.2"
18131813

1814-
"@dhis2/app-service-config@3.10.0-alpha.1", "@dhis2/app-service-config@3.8.0", "@dhis2/app-service-config@file:../../services/config":
1815-
version "3.10.0-alpha.1"
1814+
"@dhis2/app-service-config@3.10.0-alpha.2", "@dhis2/app-service-config@3.8.0", "@dhis2/app-service-config@file:../../services/config":
1815+
version "3.10.0-alpha.2"
18161816

1817-
"@dhis2/app-service-data@3.10.0-alpha.1", "@dhis2/app-service-data@3.8.0", "@dhis2/app-service-data@file:../../services/data":
1818-
version "3.10.0-alpha.1"
1817+
"@dhis2/app-service-data@3.10.0-alpha.2", "@dhis2/app-service-data@3.8.0", "@dhis2/app-service-data@file:../../services/data":
1818+
version "3.10.0-alpha.2"
18191819
dependencies:
18201820
react-query "^3.13.11"
18211821

1822-
"@dhis2/app-service-offline@3.10.0-alpha.1", "@dhis2/app-service-offline@3.8.0", "@dhis2/app-service-offline@file:../../services/offline":
1823-
version "3.10.0-alpha.1"
1822+
"@dhis2/app-service-offline@3.10.0-alpha.2", "@dhis2/app-service-offline@3.8.0", "@dhis2/app-service-offline@file:../../services/offline":
1823+
version "3.10.0-alpha.2"
18241824
dependencies:
18251825
lodash "^4.17.21"
18261826

1827-
"@dhis2/app-service-plugin@3.10.0-alpha.1", "@dhis2/app-service-plugin@file:../../services/plugin":
1828-
version "3.10.0-alpha.1"
1827+
"@dhis2/app-service-plugin@3.10.0-alpha.2", "@dhis2/app-service-plugin@file:../../services/plugin":
1828+
version "3.10.0-alpha.2"
18291829
dependencies:
18301830
post-robot "^10.0.46"
18311831

‎services/plugin/src/Plugin.tsx‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ export const Plugin = ({
3737

3838
// we do not know what is being sent in passed props, so for stable reference, memoize using JSON representation
3939
const propsToPassNonMemoizedJSON = JSON.stringify(propsToPassNonMemoized)
40-
const propsToPass = useMemo(
40+
const propsToPass: any = useMemo(
4141
() => ({ ...propsToPassNonMemoized }),
4242
// eslint-disable-next-line react-hooks/exhaustive-deps
4343
[propsToPassNonMemoizedJSON]
4444
)
45-
const { height } = propsToPass
45+
const { height, width } = propsToPass
4646

4747
const { add: alertsAdd } = useContext(AlertsManagerContext)
4848

@@ -59,19 +59,24 @@ export const Plugin = ({
5959

6060
const [inErrorState, setInErrorState] = useState<boolean>(false)
6161
const [pluginHeight, setPluginHeight] = useState<number>(150)
62+
const [pluginWidth, setPluginWidth] = useState<number>(500)
6263

6364
useEffect(() => {
6465
if (height) {
6566
setPluginHeight(height)
6667
}
67-
}, [height])
68+
if (width) {
69+
setPluginWidth(width)
70+
}
71+
}, [height, width])
6872

6973
useEffect(() => {
7074
if (iframeRef?.current) {
7175
const iframeProps = {
7276
...propsToPass,
7377
alertsAdd,
7478
setPluginHeight,
79+
setPluginWidth,
7580
setInErrorState,
7681
setCommunicationReceived,
7782
}
@@ -121,14 +126,20 @@ export const Plugin = ({
121126

122127
if (pluginEntryPoint) {
123128
return (
124-
<div style={{ height: `${pluginHeight}px` }}>
129+
<div
130+
style={{
131+
height: `${pluginHeight}px`,
132+
width: `${pluginWidth}px`,
133+
}}
134+
>
125135
<iframe
126136
ref={iframeRef}
127137
src={pluginSource}
128138
style={{
129139
width: '100%',
130140
height: '100%',
131141
border: 'none',
142+
overflowX: 'hidden',
132143
}}
133144
></iframe>
134145
</div>

0 commit comments

Comments
 (0)