Merge remote-tracking branch 'upstream/master'

Author: msmx-mnakagawa

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-lightning-design-system",
-  "version": "5.8.0",
+  "version": "5.9.0",
   "description": "Salesforce Lightning Design System components built with React",
   "main": "lib/scripts/index.js",
   "module": "module/scripts/index.js",

src/scripts/CheckboxGroup.tsx

@@ -112,8 +112,8 @@ export const CheckboxGroup = createFC<
         onChange={onChange}
       >
         <legend className='slds-form-element__label'>
-          {label}
           {required ? <abbr className='slds-required'>*</abbr> : undefined}
+          {label}
         </legend>
         <div className='slds-form-element__control' ref={controlElRef}>
           <CheckboxGroupContext.Provider value={grpCtx}>

src/scripts/FormElement.tsx

@@ -100,8 +100,8 @@ export const FormElement = createFC<
               htmlFor={id}
               onClick={id ? undefined : onClickLabel}
             >
-              {label}
               {required ? <abbr className='slds-required'>*</abbr> : undefined}
+              {label}
             </label>
           ) : null}
           {tooltip ? (

src/scripts/RadioGroup.tsx

@@ -90,8 +90,8 @@ export const RadioGroup = createFC<RadioGroupProps, { isFormElement: boolean }>(
         {...rprops}
       >
         <legend className='slds-form-element__label'>
-          {label}
           {required ? <abbr className='slds-required'>*</abbr> : undefined}
+          {label}
         </legend>
         <div className='slds-form-element__control'>
           <RadioGroupContext.Provider value={grpCtx}>