Integration finished

2025-07-03 21:22:06 +02:00
parent 8952aba12d
commit 09397edef9
15 changed files with 678 additions and 611 deletions
@@ -101,100 +101,110 @@ const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, setLoadingState
    <>
      <div className="block flex w-full flex-col opacity-100 transition-opacity duration-150 ease-linear mb-4">
        <div className="relative flex w-full items-center justify-between rounded-md bg-zinc-600 p-2 px-4">
-          <label>Fuel ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
-          <input
-            type="text"
-            placeholder=""
-            className={`w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right`}
-            value={fuel}
-            onChange={(e) => handleInput(e.target.value, WASMData.limits.maxFuel, setFuel)}
-            disabled={loadingState !== 'preview' || GSXActive()}
-          />
-          <button
-            className="middle none center rounded-lg bg-green-600 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
-            data-ripple-light="true"
-            onClick={() => {
-              SimVar.SetSimVarValue(
-                'L:MD11_EFB_PAYLOAD_FUEL',
-                'lbs',
-                WASMData.userData.isImperial ? fuel : fuel * 2.20462262185
-              );
-              SimVar.SetSimVarValue('L:MD11_EFB_READ_READY', 'bool', true);
-              setFuelEnabled(WASMData.livePayload.fuel === fuel);
-            }}
-            disabled={loadingState !== 'preview' || !fuelEnabled || GSXActive()}
-          >
-            Load Fuel
-          </button>
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>Fuel ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
+            <input
+              type="text"
+              placeholder=""
+              className={`w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right`}
+              value={fuel}
+              onChange={(e) => handleInput(e.target.value, WASMData.limits.maxFuel, setFuel)}
+              disabled={loadingState !== 'preview' || GSXActive()}
+            />
+            <button
+              className="middle none center rounded-lg bg-green-600 px-6 py-3 font-sans text-xs font-bold uppercase text-white shadow-md shadow-green-500/20 transition-all hover:shadow-lg hover:shadow-green-500/40 focus:opacity-[0.85] focus:shadow-none active:opacity-[0.85] active:shadow-none disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none"
+              data-ripple-light="true"
+              onClick={() => {
+                SimVar.SetSimVarValue(
+                  'L:MD11_EFB_PAYLOAD_FUEL',
+                  'lbs',
+                  WASMData.userData.isImperial ? fuel : fuel * 2.20462262185
+                );
+                SimVar.SetSimVarValue('L:MD11_EFB_READ_READY', 'bool', true);
+                setFuelEnabled(WASMData.livePayload.fuel === fuel);
+              }}
+              disabled={loadingState !== 'preview' || !fuelEnabled || GSXActive()}
+            >
+              Load Fuel
+            </button>
+          </div>
        </div>
      </div>

      <div className="block flex w-full flex-col opacity-100 transition-opacity duration-150 ease-linear mb-4">
        <div className="relative flex w-full items-center justify-between rounded-t-md bg-zinc-600 p-2 px-4">
-          <label>Target ZFW ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
-          <input
-            type="text"
-            placeholder=""
-            className="w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right focus:border-blue-600 focus:ring-blue-600"
-            value={ZFWTarget}
-            onChange={(e) => handleInputZFW(e.target.value)}
-            onBlur={(e) => handleBlur(e.target.value)}
-            disabled={loadingState !== 'preview' || GSXActive()}
-          />
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>Target ZFW ({WASMData.userData.isImperial ? 'lbs' : 'kg'})</label>
+            <input
+              type="text"
+              placeholder=""
+              className="w-1/2 rounded-lg border border-white bg-zinc-700 px-3 py-2 text-right focus:border-blue-600 focus:ring-blue-600"
+              value={ZFWTarget}
+              onChange={(e) => handleInputZFW(e.target.value)}
+              onBlur={(e) => handleBlur(e.target.value)}
+              disabled={loadingState !== 'preview' || GSXActive()}
+            />
+          </div>
        </div>
        <div className="relative flex w-full items-center justify-between rounded-b-md bg-zinc-700 p-2 px-4">
-          <label>
-            Target ZFWCG ({WASMData.limits.minCG} - {WASMData.limits.maxCG})
-          </label>
-          <CGSelect
-            minCG={WASMData.limits.minCG}
-            maxCG={WASMData.limits.maxCG}
-            value={CGTarget}
-            disabled={loadingState !== 'preview' || GSXActive()}
-            increase={() =>
-              setCGTarget((prev) => {
-                const _new = prev + 0.1;
-                updateData(undefined, _new);
-                return _new;
-              })
-            }
-            decrease={() =>
-              setCGTarget((prev) => {
-                const _new = prev - 0.1;
-                updateData(undefined, _new);
-                return _new;
-              })
-            }
-          />
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>
+              Target ZFWCG ({WASMData.limits.minCG} - {WASMData.limits.maxCG})
+            </label>
+            <CGSelect
+              minCG={WASMData.limits.minCG}
+              maxCG={WASMData.limits.maxCG}
+              value={CGTarget}
+              disabled={loadingState !== 'preview' || GSXActive()}
+              increase={() =>
+                setCGTarget((prev) => {
+                  const _new = prev + 0.1;
+                  updateData(undefined, _new);
+                  return _new;
+                })
+              }
+              decrease={() =>
+                setCGTarget((prev) => {
+                  const _new = prev - 0.1;
+                  updateData(undefined, _new);
+                  return _new;
+                })
+              }
+            />
+          </div>
        </div>
      </div>

      <div className="block flex w-full flex-col opacity-100 transition-opacity duration-150 ease-linear mb-4">
        <div className="relative flex w-full items-center justify-between rounded-t-md bg-zinc-600 p-2 px-4">
-          <label>
-            {loadingState !== 'loaded' && !GSXActive() ? 'Expected' : 'Actual'} ZFW (
-            {WASMData.userData.isImperial ? 'lbs' : 'kg'})
-          </label>
-          <input
-            type="text"
-            placeholder=""
-            className={`w-1/2 rounded-lg border ${ZFWValid() ? 'border-white' : 'border-red-500 text-red-500'} bg-zinc-700 px-3 py-2 text-right`}
-            disabled
-            value={ZFW()}
-          />
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>
+              {loadingState !== 'loaded' && !GSXActive() ? 'Expected' : 'Actual'} ZFW (
+              {WASMData.userData.isImperial ? 'lbs' : 'kg'})
+            </label>
+            <input
+              type="text"
+              placeholder=""
+              className={`w-1/2 rounded-lg border ${ZFWValid() ? 'border-white' : 'border-red-500 text-red-500'} bg-zinc-700 px-3 py-2 text-right`}
+              disabled
+              value={ZFW()}
+            />
+          </div>
        </div>
        <div className="relative flex w-full items-center justify-between rounded-b-md bg-zinc-700 p-2 px-4">
-          <label>
-            {loadingState !== 'loaded' && !GSXActive() ? 'Expected' : 'Actual'} GW (
-            {WASMData.userData.isImperial ? 'lbs' : 'kg'})
-          </label>
-          <input
-            type="text"
-            placeholder=""
-            className={`w-1/2 rounded-lg border ${GWValid() ? 'border-white' : 'border-red-500 text-red-500'} bg-zinc-700 px-3 py-2 text-right`}
-            disabled
-            value={GW()}
-          />
+          <div className="flex w-full items-center justify-between text-xs">
+            <label>
+              {loadingState !== 'loaded' && !GSXActive() ? 'Expected' : 'Actual'} GW (
+              {WASMData.userData.isImperial ? 'lbs' : 'kg'})
+            </label>
+            <input
+              type="text"
+              placeholder=""
+              className={`w-1/2 rounded-lg border ${GWValid() ? 'border-white' : 'border-red-500 text-red-500'} bg-zinc-700 px-3 py-2 text-right`}
+              disabled
+              value={GW()}
+            />
+          </div>
        </div>
      </div>

@@ -202,7 +212,6 @@ const ZFWEntryF: FC<ZFWEntryProps> = ({ WASMData, loadingState, setLoadingState
        loadingState={loadingState}
        loadDisabled={!GWValid()}
        GSXSync={WASMData.options.GSXSync}
-        GSXActive={GSXActive()}
        load={() => {
          setLoadingState('loaded');